From 1a4ca9bb3b675fba087476f98bd19aa5350b0050 Mon Sep 17 00:00:00 2001 From: Chris Meyer <34664+cmeyer@users.noreply.github.com> Date: Thu, 26 Sep 2024 18:07:47 -0700 Subject: [PATCH] Drop Python 3.9, 3.10. Add Python 3.13. --- .github/workflows/python-package.yml | 10 +++++----- meta.yaml | 2 +- setup.cfg | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 190c9f5..fb689c2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 @@ -46,25 +46,25 @@ jobs: python -m unittest discover -s nionswift_plugin/usim/test/ -p "*_test.py" - name: Upload Artifacts uses: actions/upload-artifact@v4 - if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9' + if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' with: name: distribution path: dist - name: Publish package to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9' + if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' with: skip-existing: true user: __token__ password: ${{ secrets.pypi_password }} - name: Set up Miniconda for conda-build - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9' + if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true python-version: '3.10' - name: Build/publish anaconda package - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9' + if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' shell: bash -l {0} run: | # make a directory to avoid name conflicts with the channel. argh. diff --git a/meta.yaml b/meta.yaml index ffcb34e..82a5c17 100644 --- a/meta.yaml +++ b/meta.yaml @@ -18,7 +18,7 @@ requirements: - pip - setuptools run: - - python >=3.9,!=3.9.7 + - python >=3.11 - nionswift >=16.9.0,<17.0.0 - nionswift-instrumentation >=22.0.0,<24.0.0 diff --git a/setup.cfg b/setup.cfg index d22280c..b25950d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,14 +10,13 @@ license = GPL-3.0-only classifiers = Development Status :: 5 - Production/Stable License :: OSI Approved :: GNU General Public License v3 (GPLv3) - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 + Programming Language :: Python :: 3.13 [options] packages = find_namespace: -python_requires = >=3.9,!=3.9.7 +python_requires = >=3.11 install_requires = nionswift-instrumentation >=22.0.0,<24.0.0