Merge branch 'letmaik:main' into matt-imageio-imwrite

Author: mplough-kobold

.github/scripts/build-linux.sh

@@ -10,9 +10,7 @@ CHECK_SHA256=.github/scripts/check_sha256.sh
 # List python versions
 ls /opt/python
 
-if [ $PYTHON_VERSION == "3.8" ]; then
-    PYBIN="/opt/python/cp38-cp38/bin"
-elif [ $PYTHON_VERSION == "3.9" ]; then
+if [ $PYTHON_VERSION == "3.9" ]; then
     PYBIN="/opt/python/cp39-cp39/bin"
 elif [ $PYTHON_VERSION == "3.10" ]; then
     PYBIN="/opt/python/cp310-cp310/bin"

.github/scripts/test-linux.sh

@@ -6,9 +6,7 @@ cd /io
 # List python versions
 ls /opt/python
 
-if [ $PYTHON_VERSION == "3.8" ]; then
-    PYBIN="/opt/python/cp38-cp38/bin"
-elif [ $PYTHON_VERSION == "3.9" ]; then
+if [ $PYTHON_VERSION == "3.9" ]; then
     PYBIN="/opt/python/cp39-cp39/bin"
 elif [ $PYTHON_VERSION == "3.10" ]; then
     PYBIN="/opt/python/cp310-cp310/bin"

.github/workflows/ci.yml

@@ -161,7 +161,7 @@ jobs:
     runs-on: ${{ matrix.config.os-image }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
@@ -202,9 +202,9 @@ jobs:
         NUMPY_VERSION: ${{ matrix.config.numpy-version }}
 
     - name: Store wheels as artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: wheels
+        name: wheel-${{ matrix.config.os-name }}-${{ matrix.config.python-arch }}-${{ matrix.config.python-version }}
         path: dist
 
   test:
@@ -340,14 +340,15 @@ jobs:
     needs: build
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Download wheels from artifact storage
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        name: wheels
+        pattern: wheel-*
+        merge-multiple: true
         path: dist
 
     - name: Set up QEMU
@@ -394,17 +395,18 @@ jobs:
     needs: build
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup Python
       uses: actions/setup-python@v1
       with:
         python-version: '3.9'
 
     - name: Download wheels from artifact storage
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        name: wheels
+        pattern: wheel-*
+        merge-multiple: true
         path: dist
 
     - name: Install from wheel
@@ -416,10 +418,9 @@ jobs:
       run: sphinx-build -b html docs dist-docs
 
     - name: Store docs HTML as artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-pages-artifact@v3
       with:
-        name: docs
-        path: dist-docs
+        path: dist-docs/
 
   publish-wheels:
     runs-on: ubuntu-latest
@@ -430,9 +431,10 @@ jobs:
 
     steps:
     - name: Download wheels from artifact storage
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        name: wheels
+        pattern: wheel-*
+        merge-multiple: true
         path: dist
 
     - name: Setup Python
@@ -449,19 +451,14 @@ jobs:
     needs: [publish-wheels]
 
     permissions:
-      contents: write
+      pages: write      # to deploy to Pages
+      id-token: write   # to verify the deployment originates from an appropriate source
 
-    steps:
-    - name: Download docs HTML from artifact storage
-      uses: actions/download-artifact@v1
-      with:
-        name: docs
-        path: dist-docs
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
 
-    # TODO replace with https://github.com/actions/deploy-pages once out of beta
-    - name: Upload docs to GitHub Pages
-      uses: peaceiris/actions-gh-pages@47a6d63ea8b47b19328e258563aa1fbe224c0a23
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        PUBLISH_BRANCH: gh-pages
-        PUBLISH_DIR: ./dist-docs
+    steps:
+    - name: Deploy to GitHub Pages
+      id: deployment
+      uses: actions/deploy-pages@v4

setup.py

@@ -298,6 +298,10 @@ def mac_libraw_compile():
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Cython',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Operating System :: MacOS',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX',