From 2fd32f986f04d0aea494431e47164dc5c4b64b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= Date: Fri, 5 Sep 2025 20:14:41 -0700 Subject: [PATCH 1/3] CI: adding python 3.14 to CI --- .github/workflows/ci_devtests.yml | 8 ++++---- tox.ini | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_devtests.yml b/.github/workflows/ci_devtests.yml index 3b1122eb..b4bd2276 100644 --- a/.github/workflows/ci_devtests.yml +++ b/.github/workflows/ci_devtests.yml @@ -41,11 +41,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - name: Set up Python 3.13 + - name: Set up Python 3.14 uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 with: - python-version: "3.13-dev" + python-version: "3.14-dev" - name: Install tox run: python -m pip install --upgrade tox - - name: Run tests against dev dependencies - run: tox -e py313-test + - name: Run tests + run: tox -e py314-test diff --git a/tox.ini b/tox.ini index 8c29ceba..4fa94e65 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ # as oldestdeps and devastropy might not support the full python range # listed here envlist = - py{39,310,311,312,313}-test{,-alldeps,-oldestdeps,-devdeps}{,-online}{,-cov} + py{39,310,311,312,313,314}-test{,-alldeps,-oldestdeps,-devdeps}{,-online}{,-cov} linkcheck codestyle build_docs @@ -26,6 +26,8 @@ setenv = PYTEST_ARGS = -rsxf --show-capture=no online: PYTEST_ARGS = --remote-data=any --reruns=1 --reruns-delay 10 -rsxf --show-capture=no devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/scientific-python-nightly-wheels/simple https://pypi.anaconda.org/liberfa/simple https://pypi.anaconda.org/astropy/simple + # No astropy py314 wheels on pypi yet + py314: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/liberfa/simple https://pypi.anaconda.org/astropy/simple deps = cov: coverage From b06d5ca40922806f4be1e52fa4a3aced7a1fa291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= Date: Fri, 5 Sep 2025 20:15:16 -0700 Subject: [PATCH 2/3] CI: update versions in CI matrix --- .github/workflows/ci_devtests.yml | 6 +++--- .github/workflows/ci_tests.yml | 16 ++++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci_devtests.yml b/.github/workflows/ci_devtests.yml index b4bd2276..5b358907 100644 --- a/.github/workflows/ci_devtests.yml +++ b/.github/workflows/ci_devtests.yml @@ -22,14 +22,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - name: Set up Python 3.12 + - name: Set up Python 3.13 uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 with: - python-version: "3.12" + python-version: "3.13" - name: Install tox run: python -m pip install --upgrade tox - name: Run tests against dev dependencies - run: tox -e py312-test-devdeps-alldeps-cov + run: tox -e py313-test-devdeps-alldeps-cov - name: Upload coverage to codecov uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0 diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index f7afb510..362c8cda 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -20,19 +20,23 @@ concurrency: jobs: tests: runs-on: ubuntu-latest + name: linux strategy: fail-fast: false matrix: include: - - name: py39 oldest dependencies, Linux + - name: py39 oldest dependencies python-version: '3.9' tox_env: py39-test-oldestdeps-alldeps - - name: py310 mandatory dependencies only, Linux + - name: py310 mandatory dependencies only python-version: '3.10' tox_env: py310-test - - name: py311 with online tests, Linux + - name: py311 alldeps python-version: '3.11' - tox_env: py311-test-alldeps-online + tox_env: py311-test-alldeps + - name: py313 alldeps online + python-version: '3.13' + tox_env: py313-test-alldeps steps: - name: Checkout code @@ -50,7 +54,7 @@ jobs: mac_windows: runs-on: ${{ matrix.os }} - name: ${{ matrix.os }} py310 + name: ${{ matrix.os }} py312 strategy: fail-fast: false matrix: @@ -66,7 +70,7 @@ jobs: python-version: '3.12' - name: Install tox run: python -m pip install --upgrade tox - - name: Python 3.12 with latest astropy + - name: Python 3.12 with latest dependencies run: tox -e py312-test-alldeps From e892b23478212016e96a44961a174bd419f84c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= Date: Fri, 5 Sep 2025 20:24:14 -0700 Subject: [PATCH 3/3] CI: fix CI job names --- .github/workflows/ci_devtests.yml | 4 +++- .github/workflows/ci_tests.yml | 14 +++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci_devtests.yml b/.github/workflows/ci_devtests.yml index 5b358907..e001c2a9 100644 --- a/.github/workflows/ci_devtests.yml +++ b/.github/workflows/ci_devtests.yml @@ -20,6 +20,7 @@ concurrency: jobs: devdeps: runs-on: ubuntu-latest + name: linux (3.13 py313-test-devdeps-alldeps-cov) steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Set up Python 3.13 @@ -37,8 +38,9 @@ jobs: file: ./coverage.xml verbose: true - py313: + py314: runs-on: ubuntu-latest + name: linux (3.14 py314-test) steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Set up Python 3.14 diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 362c8cda..1d83a2b5 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -25,17 +25,13 @@ jobs: fail-fast: false matrix: include: - - name: py39 oldest dependencies - python-version: '3.9' + - python-version: '3.9' tox_env: py39-test-oldestdeps-alldeps - - name: py310 mandatory dependencies only - python-version: '3.10' + - python-version: '3.10' tox_env: py310-test - - name: py311 alldeps - python-version: '3.11' + - python-version: '3.11' tox_env: py311-test-alldeps - - name: py313 alldeps online - python-version: '3.13' + - python-version: '3.13' tox_env: py313-test-alldeps steps: @@ -54,7 +50,7 @@ jobs: mac_windows: runs-on: ${{ matrix.os }} - name: ${{ matrix.os }} py312 + name: ${{ matrix.os }} (3.12 py312-test-alldeps) strategy: fail-fast: false matrix: