From 071be121b51042aad71cc0ef8eb529daf69d3cc6 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 25 Sep 2025 13:50:33 +0200 Subject: [PATCH 1/2] Bump Python versions --- .github/workflows/docs.yml | 27 +++++++++++++-------------- .github/workflows/test_and_deploy.yml | 14 ++++++-------- .readthedocs.yaml | 2 +- docs/changelog.rst | 8 ++++++++ setup.cfg | 2 +- tox.ini | 2 +- 6 files changed, 30 insertions(+), 25 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6a5d182f..9e1213b2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,6 @@ permissions: contents: read on: - pull_request: branches: - main @@ -25,7 +24,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.13" - uses: tlambert03/setup-qt-libs@19e4ef2d781d81f5f067182e228b54ec90d23b76 # v1 @@ -53,16 +52,16 @@ jobs: needs: build-docs if: contains(github.ref, 'tags') steps: - - uses: actions/checkout@v4 - with: - persist-credentials: false - - uses: actions/download-artifact@v4.3.0 - with: - name: docs + - uses: actions/checkout@v4 + with: + persist-credentials: false + - uses: actions/download-artifact@v4.3.0 + with: + name: docs - - name: Push to GitHub pages - uses: JamesIves/github-pages-deploy-action@6c2d9db40f9296374acc17b90404b6e8864128c8 # v4 - with: - folder: html - ssh-key: ${{ secrets.DEPLOY_KEY }} - repository-name: napari-matplotlib/napari-matplotlib.github.io + - name: Push to GitHub pages + uses: JamesIves/github-pages-deploy-action@6c2d9db40f9296374acc17b90404b6e8864128c8 # v4 + with: + folder: html + ssh-key: ${{ secrets.DEPLOY_KEY }} + repository-name: napari-matplotlib/napari-matplotlib.github.io diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 0521c9e6..0703c9d5 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -15,21 +15,21 @@ on: merge_group: concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: pre-commit: name: precommit runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 + - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 with: python-version: "3.x" - - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1 + - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1 with: extra_args: --hook-stage manual --all-files test: @@ -39,7 +39,7 @@ jobs: fail-fast: false matrix: platform: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.10', '3.11', '3.12'] + python-version: ["3.11", "3.11", "3.13"] steps: - uses: actions/checkout@v4 @@ -87,8 +87,6 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: false - - deploy: # this will run when you have tagged a commit, starting with "v*" # and requires that you have put your twine API key in your diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 797cee13..14c5fd1f 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,6 +10,6 @@ python: build: os: ubuntu-22.04 tools: - python: "3.10" + python: "3.13" apt_packages: - xvfb diff --git a/docs/changelog.rst b/docs/changelog.rst index 4cf19646..b914c93e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,14 @@ Changelog ========= +4.0.0 +----- +Dependencies +~~~~~~~~~~~~ + +- Dropped support for Python 3.10 +- Added explicit support and testing for Python 3.13 + 3.0.1 ----- Bug fixes diff --git a/setup.cfg b/setup.cfg index a3709e66..5ccef5c0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,7 +31,7 @@ install_requires = napari>=0.5 numpy>=1.23 tinycss2 -python_requires = >=3.10 +python_requires = >=3.11 include_package_data = True package_dir = =src diff --git a/tox.ini b/tox.ini index f4aed6a8..1ad69a42 100644 --- a/tox.ini +++ b/tox.ini @@ -4,9 +4,9 @@ isolated_build = true [gh-actions] python = - 3.10: py310 3.11: py311 3.12: py312 + 3.13: py313 [testenv] extras = testing From 6e3eacd316fed097f5ff2f24710e6ccfd63b3949 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 25 Sep 2025 14:00:02 +0200 Subject: [PATCH 2/2] Fix version number --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 0703c9d5..abd8ef4e 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -39,7 +39,7 @@ jobs: fail-fast: false matrix: platform: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.11", "3.11", "3.13"] + python-version: ["3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4