From 9b9b7616227e0f7d33f71722c5a549a8ac5a4ad8 Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Tue, 23 Apr 2024 17:44:15 -0700 Subject: [PATCH 1/3] Disable uwsgi and pyaudio stubtest --- stubs/pyaudio/METADATA.toml | 2 +- stubs/uWSGI/METADATA.toml | 5 +---- tests/parse_metadata.py | 8 ++++---- tests/stubtest_third_party.py | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/stubs/pyaudio/METADATA.toml b/stubs/pyaudio/METADATA.toml index 68f013087238..2fe345e15aac 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 = ["darwin", "linux"] +platforms = ["linux"] apt_dependencies = ["portaudio19-dev"] brew_dependencies = ["portaudio"] diff --git a/stubs/uWSGI/METADATA.toml b/stubs/uWSGI/METADATA.toml index 9807d0b14a09..66fe1013f637 100644 --- a/stubs/uWSGI/METADATA.toml +++ b/stubs/uWSGI/METADATA.toml @@ -9,7 +9,4 @@ extra_description = """\ """ [tool.stubtest] -# Run stubtest on MacOS as well, to check that the -# uWSGI-specific parts of stubtest_third_party.py -# also work there -platforms = ["linux", "darwin"] +platforms = ["linux"] diff --git a/tests/parse_metadata.py b/tests/parse_metadata.py index 363ad86b0da6..f843d103ce4d 100644 --- a/tests/parse_metadata.py +++ b/tests/parse_metadata.py @@ -57,7 +57,7 @@ class StubtestSettings: Don't construct instances directly; use the `read_stubtest_settings` function. """ - skipped: bool + skip: bool apt_dependencies: list[str] brew_dependencies: list[str] choco_dependencies: list[str] @@ -79,7 +79,7 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings: with Path("stubs", distribution, "METADATA.toml").open("rb") as f: data: dict[str, object] = tomli.load(f).get("tool", {}).get("stubtest", {}) - skipped: object = data.get("skip", False) + skip: object = data.get("skip", False) apt_dependencies: object = data.get("apt_dependencies", []) brew_dependencies: object = data.get("brew_dependencies", []) choco_dependencies: object = data.get("choco_dependencies", []) @@ -88,7 +88,7 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings: specified_platforms: object = data.get("platforms", ["linux"]) stubtest_requirements: object = data.get("stubtest_requirements", []) - assert type(skipped) is bool + assert type(skip) is bool assert type(ignore_missing_stub) is bool # It doesn't work for type-narrowing if we use a for loop here... @@ -110,7 +110,7 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings: ) return StubtestSettings( - skipped=skipped, + skip=skip, apt_dependencies=apt_dependencies, brew_dependencies=brew_dependencies, choco_dependencies=choco_dependencies, diff --git a/tests/stubtest_third_party.py b/tests/stubtest_third_party.py index e963288b9df1..a9a123fa8ec7 100755 --- a/tests/stubtest_third_party.py +++ b/tests/stubtest_third_party.py @@ -27,7 +27,7 @@ def run_stubtest( print(f"{dist_name}... ", end="", flush=True) stubtest_settings = metadata.stubtest_settings - if stubtest_settings.skipped: + if stubtest_settings.skip: print(colored("skipping", "yellow")) return True From cd9dee56f3efa9687504cbfab0067d00c6f99e29 Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Tue, 23 Apr 2024 17:49:47 -0700 Subject: [PATCH 2/3] . --- stubs/JACK-Client/METADATA.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/JACK-Client/METADATA.toml b/stubs/JACK-Client/METADATA.toml index f18e0144f591..5f44715f9ad8 100644 --- a/stubs/JACK-Client/METADATA.toml +++ b/stubs/JACK-Client/METADATA.toml @@ -5,7 +5,7 @@ requires = ["numpy>=1.20", "types-cffi"] [tool.stubtest] # darwin and win32 are equivalent -platforms = ["darwin", "linux"] +platforms = ["linux"] apt_dependencies = ["libjack-dev"] brew_dependencies = ["jack"] # No need to install on the CI. Leaving here as information for Windows contributors. From e610096668c9daa312d88ae4818bc9b1fe2b7878 Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Tue, 23 Apr 2024 17:50:33 -0700 Subject: [PATCH 3/3] . --- stubs/JACK-Client/METADATA.toml | 2 +- stubs/pyaudio/METADATA.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/JACK-Client/METADATA.toml b/stubs/JACK-Client/METADATA.toml index 5f44715f9ad8..bd070e6d0493 100644 --- a/stubs/JACK-Client/METADATA.toml +++ b/stubs/JACK-Client/METADATA.toml @@ -7,6 +7,6 @@ requires = ["numpy>=1.20", "types-cffi"] # darwin and win32 are equivalent platforms = ["linux"] apt_dependencies = ["libjack-dev"] -brew_dependencies = ["jack"] +# brew_dependencies = ["jack"] # No need to install on the CI. Leaving here as information for Windows contributors. # choco_dependencies = ["jack"] diff --git a/stubs/pyaudio/METADATA.toml b/stubs/pyaudio/METADATA.toml index 2fe345e15aac..c39576366b74 100644 --- a/stubs/pyaudio/METADATA.toml +++ b/stubs/pyaudio/METADATA.toml @@ -6,4 +6,4 @@ version = "0.2.*" # linux and win32 are equivalent platforms = ["linux"] apt_dependencies = ["portaudio19-dev"] -brew_dependencies = ["portaudio"] +# brew_dependencies = ["portaudio"]