diff --git a/.github/workflows/_run-ci.yml b/.github/workflows/_run-ci.yml index 7312af87..e3e45255 100644 --- a/.github/workflows/_run-ci.yml +++ b/.github/workflows/_run-ci.yml @@ -202,8 +202,8 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - # 3.10 matches miles-D's setup.py / pyproject (python_requires=">=3.10"). - python-version: '3.10' + # 3.12 matches the CI/dev container image and miles-D's setup.py. + python-version: '3.12' - name: Install uv uses: astral-sh/setup-uv@v5 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index d0e05b27..dc09b3c7 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' cache: 'pip' - name: Install pre-commit diff --git a/pyproject.toml b/pyproject.toml index b0f7628e..0009454e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta" profile = "black" # black-compatible line_length = 119 # should match black parameters ignore_whitespace = true # ignore whitespace for compatibility with the initial style -py_version = 310 # python 3.10 as a target version +py_version = 312 # python 3.12 as a target version sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"] default_section = "THIRDPARTY" extend_skip = ["setup.py", "docs/source/conf.py"] diff --git a/setup.py b/setup.py index 8c079432..c319590e 100644 --- a/setup.py +++ b/setup.py @@ -41,10 +41,8 @@ def get_tag(self): "torch>=2.0", ] }, - python_requires=">=3.10", + python_requires=">=3.12", classifiers=[ - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Environment :: GPU :: NVIDIA CUDA", "Topic :: Scientific/Engineering :: Artificial Intelligence", diff --git a/tests/fast/dashboard/test_async_collector.py b/tests/fast/dashboard/test_async_collector.py index c136a9da..369816fa 100644 --- a/tests/fast/dashboard/test_async_collector.py +++ b/tests/fast/dashboard/test_async_collector.py @@ -1,3 +1,7 @@ +from tests.ci.ci_register import register_cpu_ci + +register_cpu_ci(est_time=15, suite="stage-a-cpu", labels=[]) + import logging import sys import types @@ -80,7 +84,6 @@ def remote(self, config): monkeypatch.setitem(sys.modules, "ray", ray_module) monkeypatch.setitem(sys.modules, "ray.util.scheduling_strategies", strategies_module) monkeypatch.setattr(backend, "_handle", None) - monkeypatch.setattr(backend, "_is_primary", False) args = SimpleNamespace( use_miles_dashboard=True, diff --git a/tests/fast/utils/test_diffusion_rollout_response.py b/tests/fast/utils/test_diffusion_rollout_response.py index 908431f8..6f07aad4 100644 --- a/tests/fast/utils/test_diffusion_rollout_response.py +++ b/tests/fast/utils/test_diffusion_rollout_response.py @@ -1,3 +1,7 @@ +from tests.ci.ci_register import register_cpu_ci + +register_cpu_ci(est_time=15, suite="stage-a-cpu", labels=[]) + import pytest import torch diff --git a/tests/fast/utils/test_processing_utils.py b/tests/fast/utils/test_processing_utils.py index b1eab5a7..d695cdf4 100644 --- a/tests/fast/utils/test_processing_utils.py +++ b/tests/fast/utils/test_processing_utils.py @@ -1,3 +1,7 @@ +from tests.ci.ci_register import register_cpu_ci + +register_cpu_ci(est_time=15, suite="stage-a-cpu", labels=[]) + import pytest import torch