CI: fix artifact issue; minor updates

Author: MuellerSeb

.github/workflows/main.yml

@@ -69,11 +69,12 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.22.0
         with:
-          output-dir: dist
+          output-dir: dist-wheel-${{ matrix.os }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          path: ./dist/*.whl
+          name: dist-wheel-${{ matrix.os }}
+          path: ./dist-wheel-${{ matrix.os }}/*.whl
 
   build_sdist:
     name: sdist on ${{ matrix.os }} with py ${{ matrix.ver.py }} numpy${{ matrix.ver.np }}
@@ -84,20 +85,20 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-13, macos-14]
         # https://github.com/scipy/oldest-supported-numpy/blob/main/setup.cfg
         ver:
-          - {py: '3.8', np: '==1.20.0'}
-          - {py: '3.9', np: '==1.20.0'}
-          - {py: '3.10', np: '==1.21.6'}
-          - {py: '3.11', np: '==1.23.2'}
-          - {py: '3.12', np: '==1.26.2'}
-          - {py: '3.13', np: '==2.2.1'}
-          - {py: '3.13', np: '>=2.2.1'}
+          - { py: "3.8", np: "==1.20.0" }
+          - { py: "3.9", np: "==1.20.0" }
+          - { py: "3.10", np: "==1.21.6" }
+          - { py: "3.11", np: "==1.23.2" }
+          - { py: "3.12", np: "==1.26.2" }
+          - { py: "3.13", np: "==2.1.0" }
+          - { py: "3.13", np: ">=2.1.0" }
         exclude:
           - os: macos-14
-            ver: {py: '3.8', np: '==1.20.0'}
+            ver: { py: "3.8", np: "==1.20.0" }
           - os: macos-14
-            ver: {py: '3.9', np: '==1.20.0'}
+            ver: { py: "3.9", np: "==1.20.0" }
           - os: macos-14
-            ver: {py: '3.10', np: '==1.21.6'}
+            ver: { py: "3.10", np: "==1.21.6" }
     steps:
       - uses: actions/checkout@v4
         with:
@@ -112,7 +113,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install build
-          pip install build
 
       - name: Install GSTools-Cython
         env:
@@ -128,12 +128,13 @@ jobs:
       - name: Build sdist
         run: |
           # PEP 517 package builder from pypa
-          python -m build --sdist --outdir dist .
+          python -m build --sdist --outdir dist-sdist .
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: matrix.os == 'ubuntu-latest' && matrix.ver.py == '3.11'
         with:
-          path: dist/*.tar.gz
+          name: dist-sdist
+          path: dist-sdist/*.tar.gz
 
   coverage:
     name: coverage
@@ -173,9 +174,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          pattern: dist-*
+          merge-multiple: true
           path: dist
 
       - name: Publish to Test PyPI

pyproject.toml

@@ -38,6 +38,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Scientific/Engineering",
     "Topic :: Scientific/Engineering :: GIS",
     "Topic :: Scientific/Engineering :: Hydrology",