From b4391ca53d867eaacd78f4e572012b2e89d726e0 Mon Sep 17 00:00:00 2001 From: Mathias Louboutin Date: Mon, 23 Jun 2025 09:46:13 -0400 Subject: [PATCH 1/4] Limit support to Python 3.10-3.13 --- .github/workflows/flake8.yml | 8 ++++---- .github/workflows/pytest-linux.yml | 2 +- .github/workflows/pytest-macOS.yml | 2 +- .github/workflows/pythonpublish.yml | 4 ++-- setup.py | 13 +++++++++++-- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index c98fe3b..af80f1c 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.7 - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 with: - python-version: 3.7 + python-version: 3.11 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pytest-linux.yml b/.github/workflows/pytest-linux.yml index cdfdc8a..05106dd 100644 --- a/.github/workflows/pytest-linux.yml +++ b/.github/workflows/pytest-linux.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04, ubuntu-latest] - python-version: [3.8, 3.x] + python-version: [3.10, 3.11, 3.12, 3.13] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pytest-macOS.yml b/.github/workflows/pytest-macOS.yml index f866cbd..3ce15ba 100644 --- a/.github/workflows/pytest-macOS.yml +++ b/.github/workflows/pytest-macOS.yml @@ -11,7 +11,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: [3.6-dev, 3.x] + python-version: [3.10, 3.11, 3.12, 3.13] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index d1e0335..717547d 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -8,9 +8,9 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: '3.x' - name: Install dependencies diff --git a/setup.py b/setup.py index 91bde10..3275016 100644 --- a/setup.py +++ b/setup.py @@ -35,14 +35,15 @@ def extensions(): with open("README.md", "r") as fh: long_description = fh.read() -s_required = ["cython>=0.17,<=3.0.0", "versioneer", "flake8"] -i_required = ["contexttimer"] +i_required = ["contexttimer", "numpy"] +s_required = ["cython>=3.0", "versioneer", "flake8"] configuration = { 'name': 'pyrevolve', 'packages': find_packages(exclude=['examples', 'tests']), 'setup_requires': s_required, 'install_requires': i_required, + 'python_requires': '>=3.10,<=3.13', 'extras_require': {'compression': ['blosc2', 'pyzfp']}, 'ext_modules': lazy_cythonize(extensions), 'version': versioneer.get_version(), @@ -55,6 +56,14 @@ def extensions(): 'author_email': 'g.gorman@imperial.ac.uk', 'license': 'MIT', 'zip_safe': False + ,'classifiers': [ + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13' + ] } From 9f1c173fbba1bc1f8065389e0f9675762e38418a Mon Sep 17 00:00:00 2001 From: Mathias Louboutin Date: Mon, 23 Jun 2025 09:53:08 -0400 Subject: [PATCH 2/4] Fix Python version quoting and flake8 issues --- .github/workflows/flake8.yml | 2 +- .github/workflows/pytest-linux.yml | 2 +- .github/workflows/pytest-macOS.yml | 2 +- setup.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index af80f1c..8cb6e2b 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: '3.11' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pytest-linux.yml b/.github/workflows/pytest-linux.yml index 05106dd..473da8f 100644 --- a/.github/workflows/pytest-linux.yml +++ b/.github/workflows/pytest-linux.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04, ubuntu-latest] - python-version: [3.10, 3.11, 3.12, 3.13] + python-version: ['3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pytest-macOS.yml b/.github/workflows/pytest-macOS.yml index 3ce15ba..64579e2 100644 --- a/.github/workflows/pytest-macOS.yml +++ b/.github/workflows/pytest-macOS.yml @@ -11,7 +11,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: [3.10, 3.11, 3.12, 3.13] + python-version: ['3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v4 diff --git a/setup.py b/setup.py index 3275016..402cca5 100644 --- a/setup.py +++ b/setup.py @@ -55,8 +55,8 @@ def extensions(): 'author': "Imperial College London", 'author_email': 'g.gorman@imperial.ac.uk', 'license': 'MIT', - 'zip_safe': False - ,'classifiers': [ + 'zip_safe': False, + 'classifiers': [ 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3.10', From 61edb42c4ccd06f4a98cc90fbce07e4acc0a2cce Mon Sep 17 00:00:00 2001 From: Mathias Louboutin Date: Mon, 23 Jun 2025 10:05:36 -0400 Subject: [PATCH 3/4] Relax python version ceiling --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 402cca5..4b0e9b3 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def extensions(): 'packages': find_packages(exclude=['examples', 'tests']), 'setup_requires': s_required, 'install_requires': i_required, - 'python_requires': '>=3.10,<=3.13', + 'python_requires': '>=3.10,<3.14', 'extras_require': {'compression': ['blosc2', 'pyzfp']}, 'ext_modules': lazy_cythonize(extensions), 'version': versioneer.get_version(), From 0d404a7babe2e22a999bc328d95131ba84fdfd79 Mon Sep 17 00:00:00 2001 From: Mathias Louboutin Date: Mon, 23 Jun 2025 10:20:02 -0400 Subject: [PATCH 4/4] Update CI compiler and OS --- .github/workflows/pytest-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest-linux.yml b/.github/workflows/pytest-linux.yml index 473da8f..1d36921 100644 --- a/.github/workflows/pytest-linux.yml +++ b/.github/workflows/pytest-linux.yml @@ -10,11 +10,11 @@ jobs: Build-linux: runs-on: ${{ matrix.os }} env: - CC: gcc-9 + CC: gcc strategy: matrix: - os: [ubuntu-20.04, ubuntu-latest] + os: [ubuntu-22.04, ubuntu-latest] python-version: ['3.10', '3.11', '3.12', '3.13'] steps: