diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6c6c680ae63..dce17ec3f94 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache @@ -44,7 +44,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache @@ -72,7 +72,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml index 7d6236c9408..8bd60000d5f 100644 --- a/.github/workflows/style.yaml +++ b/.github/workflows/style.yaml @@ -18,7 +18,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache @@ -43,7 +43,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache @@ -68,7 +68,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache @@ -93,7 +93,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache @@ -118,7 +118,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache @@ -143,7 +143,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index ec5a68feb25..613e442a012 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - name: Clone repo uses: actions/checkout@v4.1.1 @@ -31,7 +31,7 @@ jobs: with: path: ${{ env.pythonLocation }} key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/required.txt') }}-${{ hashFiles('requirements/datasets.txt') }}-${{ hashFiles('requirements/tests.txt') }} - if: ${{ ! (runner.os == 'macOS' && matrix.python-version == '3.11') }} + if: ${{ ! (runner.os == 'macOS' && (matrix.python-version == '3.11' || matrix.python-version == '3.12')) }} - name: Setup headless display for pyvista uses: pyvista/setup-headless-display-action@v2 - name: Install apt dependencies (Linux) diff --git a/.github/workflows/tutorials.yaml b/.github/workflows/tutorials.yaml index 5833bccd4f6..7672ea19c7f 100644 --- a/.github/workflows/tutorials.yaml +++ b/.github/workflows/tutorials.yaml @@ -20,7 +20,7 @@ jobs: - name: Set up python uses: actions/setup-python@v5.0.0 with: - python-version: '3.11' + python-version: '3.12' - name: Cache dependencies uses: actions/cache@v4.0.0 id: cache diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 534c7e24017..9cfd9895a23 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,7 +8,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.11" + python: "3.12" # Configuration of the Python environment to be used python: diff --git a/experiments/torchgeo/run_resisc45_experiments.py b/experiments/torchgeo/run_resisc45_experiments.py index e4915bc0c64..1049edf749b 100755 --- a/experiments/torchgeo/run_resisc45_experiments.py +++ b/experiments/torchgeo/run_resisc45_experiments.py @@ -37,7 +37,7 @@ def do_work(work: "Queue[str]", gpu_idx: int) -> bool: for model, lr, loss, weights in itertools.product( model_options, lr_options, loss_options, weight_options ): - experiment_name = f"{model}_{lr}_{loss}_{weights.replace('_','-')}" + experiment_name = f"{model}_{lr}_{loss}_{weights.replace('_', '-')}" output_dir = os.path.join("output", "resisc45_experiments") log_dir = os.path.join(output_dir, "logs") diff --git a/experiments/torchgeo/run_so2sat_experiments.py b/experiments/torchgeo/run_so2sat_experiments.py index d574d0987c0..fd8562ca345 100755 --- a/experiments/torchgeo/run_so2sat_experiments.py +++ b/experiments/torchgeo/run_so2sat_experiments.py @@ -37,7 +37,7 @@ def do_work(work: "Queue[str]", gpu_idx: int) -> bool: for model, lr, loss, weights in itertools.product( model_options, lr_options, loss_options, weight_options ): - experiment_name = f"{model}_{lr}_{loss}_{weights.replace('_','-')}" + experiment_name = f"{model}_{lr}_{loss}_{weights.replace('_', '-')}" output_dir = os.path.join("output", "so2sat_experiments") log_dir = os.path.join(output_dir, "logs") diff --git a/experiments/torchgeo/run_so2sat_seed_experiments.py b/experiments/torchgeo/run_so2sat_seed_experiments.py index 90e6d274910..2f88eba3c75 100755 --- a/experiments/torchgeo/run_so2sat_seed_experiments.py +++ b/experiments/torchgeo/run_so2sat_seed_experiments.py @@ -38,7 +38,7 @@ def do_work(work: "Queue[str]", gpu_idx: int) -> bool: for model, lr, loss, weights, seed in itertools.product( model_options, lr_options, loss_options, weight_options, seeds ): - experiment_name = f"{model}_{lr}_{loss}_{weights.replace('_','-')}_{seed}" + experiment_name = f"{model}_{lr}_{loss}_{weights.replace('_', '-')}_{seed}" output_dir = os.path.join("output", "so2sat_seed_experiments") log_dir = os.path.join(output_dir, "logs") diff --git a/pyproject.toml b/pyproject.toml index d4a8c7ae955..5b0a12c4830 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,6 +32,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering :: Artificial Intelligence", "Topic :: Scientific/Engineering :: GIS", ]