updates action workflow for pypi build/publish

Author: Sam Hatchett

.github/workflows/build-wheels.yml

@@ -5,75 +5,53 @@ on:
 
 jobs:
   build_wheels:
-    name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}
+    name: Build wheels (simple matrix)
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-latest, ubuntu-latest, macos-latest ]
-        python: [ 36, 37, 38, 39, 310]
-        bitness: [ 32, 64 ]
-        include:
-          # Run 32 and 64 bit version in parallel for Linux and Windows
-          - os: windows-latest
-            bitness: 64
-            platform_id: win_amd64
-          - os: windows-latest
-            bitness: 32
-            platform_id: win32
-          - os: ubuntu-latest
-            bitness: 64
-            platform_id: manylinux_x86_64
-          - os: macos-latest
-            bitness: 64
-            platform_id: macosx_x86_64
-        exclude:
-          - os: macos-latest
-            bitness: 32
-          # This build was broken on OpenMP so is excluded for now
-          - os: ubuntu-latest
-            bitness: 32
+        os: [windows-latest, ubuntu-latest, macos-latest]
+        python_tag: [cp39, cp310, cp311, cp312, cp313, cp314]
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
 
-      - name: Install Python
-        uses: actions/setup-python@v2
-
-      - uses: ilammy/msvc-dev-cmd@v1
-        if: startsWith(matrix.os, 'windows')
-
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.3.1
+        run: python -m pip install cibuildwheel==2.22.0
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse owa-epanet
         env:
-          CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }}
-          CIBW_BEFORE_ALL_LINUX: git submodule update --init && yum install swig -y
+          # Build the specific Python tag (e.g. cp39, cp310) for the current matrix entry
+          CIBW_BUILD: ${{ matrix.python_tag }}-*
+          # Use manylinux_2_28 (dnf-based) for Linux builds
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
+          CIBW_BEFORE_ALL_LINUX: git submodule update --init && dnf install swig -y
           CIBW_BEFORE_ALL_WINDOWS: git submodule update && choco install swig
           CIBW_BEFORE_ALL_MACOS: git submodule update && brew install swig ninja libomp
-          CIBW_BEFORE_BUILD: pip install scikit-build==0.11.1 cmake==3.18.4
+          CIBW_BEFORE_BUILD: pip install scikit-build cmake
           CIBW_BUILD_VERBOSITY: 1
           CIBW_TEST_COMMAND: pytest {package}
-          CIBW_BEFORE_TEST: pip install scikit-build==0.11.1 cmake==3.18.4
+          CIBW_BEFORE_TEST: pip install scikit-build cmake
           CIBW_TEST_REQUIRES: pytest
+          # skip 32-bit manylinux and win32 test variants
           CIBW_TEST_SKIP: "*-win32 *-manylinux_i686"
 
       - name: Store artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
+          name: wheels-${{ matrix.os }}-${{ matrix.python_tag }}
           path: ./wheelhouse/*.whl
 
 
   build_sdist:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -82,38 +60,45 @@ jobs:
           cd owa-epanet
           git submodule update
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.8'
+          python-version: "3.12"
 
       - name: Install dependencies
         run: |
           sudo apt update
           sudo apt install swig -y
-          pip install scikit-build==0.11.1 cmake==3.18.4
+          pip install build scikit-build cmake
 
       - name: Build sdist
         run: |
           cd owa-epanet
-          python setup.py sdist
+          python -m build --sdist
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
+          name: sdist
           path: owa-epanet/dist/*.tar.gz
 
   upload_pypi:
     needs: [ build_wheels, build_sdist ]
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
+        with:
+          path: dist
+          pattern: wheels-*
+          merge-multiple: true
+
+      - uses: actions/download-artifact@v4
         with:
-          name: artifact
           path: dist
+          pattern: sdist
+          merge-multiple: true
 
-      - uses: pypa/gh-action-pypi-publish@v1.4.2
+      - uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
           skip_existing: true

owa-epanet/pyproject.toml

@@ -1,2 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel", "scikit-build", "cmake"]
+build-backend = "setuptools.build_meta"