From d9743192d8a72299c7f9eeda930064d0d15045cb Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Tue, 23 Apr 2024 14:38:16 +0200 Subject: [PATCH 01/11] Temporarily disables pip cache for daily stubtest third party run --- .github/workflows/daily.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index f3c1c84d23c2..7abc023f10de 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -71,10 +71,6 @@ jobs: # TODO: Use Python 3.12. As of 2024-03-08, several third-party # packages fail to install with Python 3.12. python-version: "3.11" - cache: pip - cache-dependency-path: | - requirements-tests.txt - stubs/**/METADATA.toml - name: Install dependencies run: pip install -r requirements-tests.txt - name: Run stubtest From 1dd3712fc5e45c3b64fd639cfee1b51d09b925ec Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Tue, 23 Apr 2024 14:52:36 +0200 Subject: [PATCH 02/11] Revert "Temporarily disables pip cache for daily stubtest third party run" This reverts commit d9743192d8a72299c7f9eeda930064d0d15045cb. --- .github/workflows/daily.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 7abc023f10de..f3c1c84d23c2 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -71,6 +71,10 @@ jobs: # TODO: Use Python 3.12. As of 2024-03-08, several third-party # packages fail to install with Python 3.12. python-version: "3.11" + cache: pip + cache-dependency-path: | + requirements-tests.txt + stubs/**/METADATA.toml - name: Install dependencies run: pip install -r requirements-tests.txt - name: Run stubtest From 4ecdbcbb12d4df8e092ffa068f15bc1606a80180 Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Tue, 23 Apr 2024 14:56:50 +0200 Subject: [PATCH 03/11] Updates uWSGI stubtest_allowlist_darwin --- stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt b/stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt index 6fa558c9f67b..4bda4bcba4c0 100644 --- a/stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt +++ b/stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt @@ -1,6 +1,6 @@ # Error: is not present at runtime # ============================= -# These functions depend on modules which are not built into +# These functions depend on modules which are not always built # the MacOS wheel by default, so we just ignore them for now # we don't want to pretend they don't exist, because people # could still configure a build with the required modules @@ -9,3 +9,8 @@ uwsgi.SymbolsImporter uwsgi.SymbolsZipImporter uwsgi.ZipImporter +# These may or may not exist depending on how the CI is feeling +# at any given point in time +(uwsgi\.i_am_the_lord)? +(uwsgi\.lord_scroll)? +(uwsgi\.scrolls)? From 5e861ab773807d142889523bd75c5fb26898490e Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Tue, 23 Apr 2024 15:02:08 +0200 Subject: [PATCH 04/11] Temporarily removes cache from stubtest_third_party workflow --- .github/workflows/stubtest_third_party.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/stubtest_third_party.yml b/.github/workflows/stubtest_third_party.yml index b1d8fcc3d4cf..466775d57fda 100644 --- a/.github/workflows/stubtest_third_party.yml +++ b/.github/workflows/stubtest_third_party.yml @@ -44,10 +44,6 @@ jobs: # TODO: Use Python 3.12. As of 2024-03-08, several third-party # packages fail to install with Python 3.12. python-version: "3.11" - cache: pip - cache-dependency-path: | - requirements-tests.txt - stubs/**/METADATA.toml - name: Install dependencies run: pip install -r requirements-tests.txt - name: Run stubtest From 1147e8caea9a9094d1f2d3ef1e13902ac8ef3f20 Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Tue, 23 Apr 2024 15:06:22 +0200 Subject: [PATCH 05/11] Revert "Temporarily removes cache from stubtest_third_party workflow" This reverts commit 5e861ab773807d142889523bd75c5fb26898490e. --- .github/workflows/stubtest_third_party.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/stubtest_third_party.yml b/.github/workflows/stubtest_third_party.yml index 466775d57fda..b1d8fcc3d4cf 100644 --- a/.github/workflows/stubtest_third_party.yml +++ b/.github/workflows/stubtest_third_party.yml @@ -44,6 +44,10 @@ jobs: # TODO: Use Python 3.12. As of 2024-03-08, several third-party # packages fail to install with Python 3.12. python-version: "3.11" + cache: pip + cache-dependency-path: | + requirements-tests.txt + stubs/**/METADATA.toml - name: Install dependencies run: pip install -r requirements-tests.txt - name: Run stubtest From 3b0d914010f9bb38f9233d0921c12800baf1f118 Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Wed, 24 Apr 2024 09:08:45 +0200 Subject: [PATCH 06/11] Re-enables stubtest on uWSGI and pyaudio --- stubs/pyaudio/METADATA.toml | 4 ++-- stubs/uWSGI/METADATA.toml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stubs/pyaudio/METADATA.toml b/stubs/pyaudio/METADATA.toml index c39576366b74..68f013087238 100644 --- a/stubs/pyaudio/METADATA.toml +++ b/stubs/pyaudio/METADATA.toml @@ -4,6 +4,6 @@ version = "0.2.*" [tool.stubtest] # linux and win32 are equivalent -platforms = ["linux"] +platforms = ["darwin", "linux"] apt_dependencies = ["portaudio19-dev"] -# brew_dependencies = ["portaudio"] +brew_dependencies = ["portaudio"] diff --git a/stubs/uWSGI/METADATA.toml b/stubs/uWSGI/METADATA.toml index 66fe1013f637..9807d0b14a09 100644 --- a/stubs/uWSGI/METADATA.toml +++ b/stubs/uWSGI/METADATA.toml @@ -9,4 +9,7 @@ extra_description = """\ """ [tool.stubtest] -platforms = ["linux"] +# Run stubtest on MacOS as well, to check that the +# uWSGI-specific parts of stubtest_third_party.py +# also work there +platforms = ["linux", "darwin"] From c6adeac658cd3d134e4ea90b75fea257859e833b Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Wed, 24 Apr 2024 10:35:52 +0200 Subject: [PATCH 07/11] Temporarily changes the cache key --- .github/workflows/stubtest_third_party.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/stubtest_third_party.yml b/.github/workflows/stubtest_third_party.yml index b1d8fcc3d4cf..db6bddab839e 100644 --- a/.github/workflows/stubtest_third_party.yml +++ b/.github/workflows/stubtest_third_party.yml @@ -48,6 +48,7 @@ jobs: cache-dependency-path: | requirements-tests.txt stubs/**/METADATA.toml + stubs/**/__init__.pyi - name: Install dependencies run: pip install -r requirements-tests.txt - name: Run stubtest From 949a17f31aa1ab6b80d95cd4c67441afe9a7d0e0 Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Wed, 24 Apr 2024 10:54:34 +0200 Subject: [PATCH 08/11] Revert "Temporarily changes the cache key" This reverts commit c6adeac658cd3d134e4ea90b75fea257859e833b. --- .github/workflows/stubtest_third_party.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/stubtest_third_party.yml b/.github/workflows/stubtest_third_party.yml index db6bddab839e..b1d8fcc3d4cf 100644 --- a/.github/workflows/stubtest_third_party.yml +++ b/.github/workflows/stubtest_third_party.yml @@ -48,7 +48,6 @@ jobs: cache-dependency-path: | requirements-tests.txt stubs/**/METADATA.toml - stubs/**/__init__.pyi - name: Install dependencies run: pip install -r requirements-tests.txt - name: Run stubtest From ab2813a4b5a50c5dd83f76e730ae53ca2d67597a Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Wed, 24 Apr 2024 11:22:53 +0200 Subject: [PATCH 09/11] Reverts accidentally changed portion of comment --- stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt b/stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt index 4bda4bcba4c0..875908e1cf26 100644 --- a/stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt +++ b/stubs/uWSGI/@tests/stubtest_allowlist_darwin.txt @@ -1,6 +1,6 @@ # Error: is not present at runtime # ============================= -# These functions depend on modules which are not always built +# These functions depend on modules which are not built into # the MacOS wheel by default, so we just ignore them for now # we don't want to pretend they don't exist, because people # could still configure a build with the required modules From 8712578352d1f3ccc8dafed7cf3c01010cc30baf Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Thu, 25 Apr 2024 09:28:42 +0200 Subject: [PATCH 10/11] Tries to temporarily modify the cache key one more time --- .github/workflows/stubtest_third_party.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stubtest_third_party.yml b/.github/workflows/stubtest_third_party.yml index b1d8fcc3d4cf..d02fd00f5280 100644 --- a/.github/workflows/stubtest_third_party.yml +++ b/.github/workflows/stubtest_third_party.yml @@ -47,7 +47,7 @@ jobs: cache: pip cache-dependency-path: | requirements-tests.txt - stubs/**/METADATA.toml + stubs/uWSGI/METADATA.toml - name: Install dependencies run: pip install -r requirements-tests.txt - name: Run stubtest From 4940dd6481ed76b24ef8b7d5b9e4c70458166994 Mon Sep 17 00:00:00 2001 From: David Salvisberg Date: Thu, 25 Apr 2024 09:59:27 +0200 Subject: [PATCH 11/11] Revert "Tries to temporarily modify the cache key one more time" This reverts commit 8712578352d1f3ccc8dafed7cf3c01010cc30baf. --- .github/workflows/stubtest_third_party.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stubtest_third_party.yml b/.github/workflows/stubtest_third_party.yml index d02fd00f5280..b1d8fcc3d4cf 100644 --- a/.github/workflows/stubtest_third_party.yml +++ b/.github/workflows/stubtest_third_party.yml @@ -47,7 +47,7 @@ jobs: cache: pip cache-dependency-path: | requirements-tests.txt - stubs/uWSGI/METADATA.toml + stubs/**/METADATA.toml - name: Install dependencies run: pip install -r requirements-tests.txt - name: Run stubtest