diff --git a/examples/python/controlnet/requirements.txt b/examples/python/controlnet/requirements.txt index d7dc8b29f056..94d2d4c124a3 100644 --- a/examples/python/controlnet/requirements.txt +++ b/examples/python/controlnet/requirements.txt @@ -3,7 +3,6 @@ opencv-python pillow diffusers==0.27.2 numpy -#TODO(#4704): clean that up when pytorch is available for 3.12 -torch ; python_version < "3.12" +torch transformers rerun-sdk diff --git a/examples/python/depth_guided_stable_diffusion/requirements.txt b/examples/python/depth_guided_stable_diffusion/requirements.txt index 4841ec4dc2e0..f48c42477775 100644 --- a/examples/python/depth_guided_stable_diffusion/requirements.txt +++ b/examples/python/depth_guided_stable_diffusion/requirements.txt @@ -7,6 +7,5 @@ pillow requests>=2.31,<3 rerun-sdk scipy -#TODO(#4704): clean that up when pytorch is available for 3.12 -torch>1.13.0 ; python_version < "3.12" +torch>1.13.0 transformers>=4.26.0 diff --git a/examples/python/detect_and_track_objects/requirements.txt b/examples/python/detect_and_track_objects/requirements.txt index 2faba41baaa3..78cafec6c5e9 100644 --- a/examples/python/detect_and_track_objects/requirements.txt +++ b/examples/python/detect_and_track_objects/requirements.txt @@ -5,6 +5,5 @@ pillow requests>=2.31,<3 rerun-sdk timm==0.9.11 -#TODO(#4704): clean that up when pytorch is available for 3.12 -torch>=1.13.0 ; python_version < "3.12" +torch>=1.13.0 transformers diff --git a/examples/python/llm_embedding_ner/requirements.txt b/examples/python/llm_embedding_ner/requirements.txt index 9d989c80c142..554464f3669e 100644 --- a/examples/python/llm_embedding_ner/requirements.txt +++ b/examples/python/llm_embedding_ner/requirements.txt @@ -1,5 +1,4 @@ rerun-sdk -#TODO(#4704): clean that up when pytorch is available for 3.12 -torch ; python_version < "3.12" +torch transformers umap-learn diff --git a/examples/python/segment_anything_model/requirements.txt b/examples/python/segment_anything_model/requirements.txt index 9ee553729732..90181c6cb02f 100644 --- a/examples/python/segment_anything_model/requirements.txt +++ b/examples/python/segment_anything_model/requirements.txt @@ -3,7 +3,6 @@ numpy opencv-python requests>=2.31,<3 rerun-sdk -#TODO(#4704): clean that up when pytorch is available for 3.12 -torch ; python_version < "3.12" -torchvision ; python_version < "3.12" +torch +torchvision tqdm diff --git a/noxfile.py b/noxfile.py index 2bfc7935a701..8ad7fc0b8d05 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,13 +17,6 @@ def tests(session: nox.Session) -> None: """Run the Python test suite.""" session.install("-r", "rerun_py/requirements-build.txt") - - # TODO(#4704): clean that up when torch is 3.12 compatible - if session.python == "3.12": - session.run( - "pip", "install", "torch", "torchvision", "--pre", "--index-url", "https://download.pytorch.org/whl/nightly" - ) - session.install("./rerun_py") session.run("just", "py-test", external=True) @@ -32,12 +25,6 @@ def tests(session: nox.Session) -> None: def run_all(session: nox.Session) -> None: """Run all examples through the run_all.py script (pass args with: "-- ").""" - # TODO(#4704): clean that up when torch is 3.12 compatible - if session.python == "3.12": - session.run( - "pip", "install", "torch", "torchvision", "--pre", "--index-url", "https://download.pytorch.org/whl/nightly" - ) - # Note: the run_all.py scripts installs all dependencies itself. In particular, we can install from # examples/python/requirements.txt because it includes pyrealsense2, which is not available for mac. session.run("python", "scripts/run_all.py", "--install-requirements", *session.posargs) @@ -54,12 +41,6 @@ def roundtrips(session: nox.Session) -> None: session.install("-r", "rerun_py/requirements-build.txt") session.install("opencv-python") - - # TODO(#4704): clean that up when torch is 3.12 compatible - if session.python == "3.12": - session.run( - "pip", "install", "torch", "torchvision", "--pre", "--index-url", "https://download.pytorch.org/whl/nightly" - ) session.install("./rerun_py") extra_args = [] diff --git a/rerun_py/requirements-build.txt b/rerun_py/requirements-build.txt index ae41c64d3506..4eeb5d293455 100644 --- a/rerun_py/requirements-build.txt +++ b/rerun_py/requirements-build.txt @@ -3,5 +3,4 @@ maturin>=1.5.1 semver wheel pytest -#TODO(#4704): clean that up when pytorch is available for 3.12 -torch>=2.0.1 ; python_version < "3.12" +torch>=2.0.1 diff --git a/rerun_py/requirements-lint.txt b/rerun_py/requirements-lint.txt index 6a3bc50f7b1e..001d44d5eaac 100644 --- a/rerun_py/requirements-lint.txt +++ b/rerun_py/requirements-lint.txt @@ -2,8 +2,7 @@ attrs>=23.1.0 # for mypy to work blackdoc==0.3.8 mypy==1.8.0 numpy>=1.23,<2 # For mypy plugin -#TODO(#4704): clean that up when pytorch is available for 3.12 -torch>=2.0.1 ; python_version < "3.12" +torch>=2.0.1 pip-check-reqs==2.4.4 # Checks for missing deps in requirements.txt files pytest # For mypy to work ruff==0.2.2 diff --git a/scripts/requirements-dev.txt b/scripts/requirements-dev.txt index 6a74004947b0..3d8840a76ef4 100644 --- a/scripts/requirements-dev.txt +++ b/scripts/requirements-dev.txt @@ -8,8 +8,7 @@ cryptography==38.0.4 # for scripts/upload_image.py google-cloud-storage==2.9.0 # for scripts/upload_image.py PyGithub==1.58.2 # for scripts/ci/generate_pr_summary.py and scripts/ci/update_pr_body.py Pillow # for scripts/upload_image.py -#TODO(#4704): clean that up when pytorch is available for 3.12 -torch ; python_version < "3.12" +torch tqdm requests gitignore_parser # handle .gitignore