update supported python versions

jlaehne · Dec 21, 2023 · 7b70b44 · 7b70b44
1 parent 0d69777
commit 7b70b44
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 19 deletions.
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
@@ -6,6 +6,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
       - uses: psf/black@stable
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
       VERSION: ${{ env.VERSION }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4
       - name: Create Release
         id: create_release
         uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
@@ -47,12 +47,12 @@ jobs:
     needs: create_release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       - name: Install release dependencies
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,8 +4,8 @@ on: [push, pull_request]
 
 jobs:
   run_test_suite:
-    name: py${{ matrix.PYTHON_VERSION }}${{ matrix.LABEL }}
-    runs-on: ubuntu-latest
+    name: ${{ matrix.os }}-py${{ matrix.PYTHON_VERSION }}${{ matrix.LABEL }}
+    runs-on: ${{ matrix.os }}-latest
     timeout-minutes: 30
     env:
       MPLBACKEND: agg
@@ -15,15 +15,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.7', '3.9', '3.10']
-        PIP_SELECTOR: ['[tests]']
+        os: [ubuntu, windows, macos]
+        PYTHON_VERSION: ['3.8', '3.12']
+        PIP_SELECTOR: '[tests,]'
+        LABEL: ['']
         include:
-          - PYTHON_VERSION: '3.8'
+          - os: ubuntu
+            PYTHON_VERSION: '3.9'
+          - os: ubuntu
+            PYTHON_VERSION: '3.10'
+          - os: ubuntu
+            PYTHON_VERSION: '3.11'
             PIP_SELECTOR: '[tests, coverage]'
             PYTEST_ARGS_COVERAGE: --cov=lumispy --cov-report=xml
-            LABEL: /coverage
+            LABEL: '/coverage'
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
         name: Install Python
@@ -36,10 +43,13 @@ jobs:
           pip --version
 
       - name: Install
-        shell: bash
         run: |
           pip install ${{ env.PIP_ARGS }} .'${{ matrix.PIP_SELECTOR }}'
 
+      - name: Pip list
+        run: |
+          pip list
+
       - name: Install (HyperSpy dev)
         # Test against the hyperspy `RELEASE_next_minor` branch
         if: ${{ matrix.PYTEST_ARGS_COVERAGE }} 

diff --git a/setup.py b/setup.py
@@ -36,26 +36,28 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     classifiers=[
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
         "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Natural Language :: English",
         "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Scientific/Engineering",
         "Topic :: Scientific/Engineering :: Physics",
+        "Topic :: Software Development :: Libraries",
     ],
     keywords=release_info["keywords"],
     packages=find_packages(),
     # adjust the tabbing
     install_requires=[
+        "hyperspy >= 1.7",  # earlier versions do not provide non-uniform axes
         "numpy",
         "scipy",
-        "hyperspy >= 1.7",  # earlier versions do not provide non-uniform axes
     ],
     extras_require={
         "tests": ["pytest>=5.0"],