From 90e6bd9aca62a1f51357e569f35aeae05026051c Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Wed, 27 Nov 2024 16:50:23 +0000 Subject: [PATCH] Pin `keras` to `3.6.*` when stubtesting `tensorflow` (#13137) --- stubs/tensorflow/METADATA.toml | 4 ++-- tests/stubtest_third_party.py | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/stubs/tensorflow/METADATA.toml b/stubs/tensorflow/METADATA.toml index 775d11434119..66c658d2a6ce 100644 --- a/stubs/tensorflow/METADATA.toml +++ b/stubs/tensorflow/METADATA.toml @@ -8,5 +8,5 @@ partial_stub = true [tool.stubtest] ignore_missing_stub = true -# TODO: Support/update to keras 3.4 -stubtest_requirements = ["keras>=3.3.3,<3.4"] +# TODO: Support/update to keras 3.7 +stubtest_requirements = ["keras==3.6.*"] diff --git a/tests/stubtest_third_party.py b/tests/stubtest_third_party.py index 6e11877acf56..e10fbf96c8f8 100755 --- a/tests/stubtest_third_party.py +++ b/tests/stubtest_third_party.py @@ -75,15 +75,6 @@ def run_stubtest( dist_extras = ", ".join(stubtest_settings.extras) dist_req = f"{dist_name}[{dist_extras}]{metadata.version_spec}" - # If tool.stubtest.stubtest_requirements exists, run "pip install" on it. - if stubtest_settings.stubtest_requirements: - pip_cmd = [pip_exe, "install", *stubtest_settings.stubtest_requirements] - try: - subprocess.run(pip_cmd, check=True, capture_output=True) - except subprocess.CalledProcessError as e: - print_command_failure("Failed to install requirements", e) - return False - requirements = get_recursive_requirements(dist_name) # We need stubtest to be able to import the package, so install mypy into the venv @@ -92,6 +83,7 @@ def run_stubtest( dists_to_install = [dist_req, get_mypy_req()] # Internal requirements are added to MYPYPATH dists_to_install.extend(str(r) for r in requirements.external_pkgs) + dists_to_install.extend(stubtest_settings.stubtest_requirements) # Since the "gdb" Python package is available only inside GDB, it is not # possible to install it through pip, so stub tests cannot install it.