Staging Release

.github/workflows/build_wheel.yml

@@ -22,32 +22,32 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          submodules: true
+        uses: actions/checkout@v5
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.7
+          python-version: '3.10'
 
       - name: Build wheel
         run: |
             pip install wheel
             python setup.py bdist_wheel
-      - uses: actions/upload-artifact@v3
+
+      - name: Upload wheel artifact
+        uses: actions/upload-artifact@v4
         with:
+          name: nrtest-swmm-wheel
           path: nrtest-swmm/dist/*.whl
-
-
+
 
   build_wheels:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-2022, macos-12]
-        pyver: [cp38, cp39, cp310, cp311, cp312]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        pyver: [cp39, cp310, cp311, cp312, cp313]
 
     steps:
       - name: Checkout repo
@@ -56,10 +56,11 @@ jobs:
             submodules: true
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v3.1.4
         with:
           package-dir: ./swmm-toolkit
         env:
+          MACOSX_DEPLOYMENT_TARGET: "11.0"
           CIBW_TEST_COMMAND: "pytest {package}/tests"
           CIBW_BEFORE_TEST: pip install -r {package}/test-requirements.txt
           # mac needs ninja to build
@@ -70,31 +71,31 @@ jobs:
           # configure cibuildwheel to build native archs ('auto'), and some emulated ones
           CIBW_ARCHS_LINUX: x86_64
           CIBW_ARCHS_WINDOWS: AMD64
-          CIBW_ARCHS_MACOS: x86_64
+          CIBW_ARCHS_MACOS: x86_64 arm64
           # only build current supported python: https://devguide.python.org/versions/
           # don't build pypy or musllinux to save build time. TODO: find a good way to support those archs
           CIBW_BUILD: ${{matrix.pyver}}-*
-          CIBW_SKIP: cp36-* cp37-* pp* *-musllinux*
+          CIBW_SKIP: cp38-* pp* *-musllinux*
           # Will avoid testing on emulated architectures
           # Skip trying to test arm64 builds on Intel Macs
-          CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64"
+          CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_universal2:arm64"
           CIBW_BUILD_VERBOSITY: 1
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: wheels-${{ matrix.os }}-${{ matrix.pyver }}
           path: ./wheelhouse/*.whl
 
   build_cross_wheels:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest,macos-12]
-        pyver: [cp38, cp39, cp310, cp311, cp312]
+        pyver: [cp39, cp310, cp311, cp312, cp313]
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
             submodules: true
 
@@ -105,7 +106,7 @@ jobs:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v3.1.4
         with:
           package-dir: ./swmm-toolkit
         env:
@@ -114,13 +115,13 @@ jobs:
           CIBW_BEFORE_BUILD_LINUX: rm -f $(which swig) && rm -f $(which swig4.0)
           # configure cibuildwheel to build native archs ('auto'), and some emulated ones
           CIBW_ARCHS_LINUX: aarch64
-          CIBW_ARCHS_MACOS: arm64
           # only build current supported python: https://devguide.python.org/versions/
           # don't build pypy or musllinux to save build time. TODO: find a good way to support those archs
           CIBW_BUILD: ${{matrix.pyver}}-*
-          CIBW_SKIP: cp36-* cp37-* pp* *-musllinux*
+          CIBW_SKIP: cp-*38 pp* *-musllinux*
           CIBW_BUILD_VERBOSITY: 1
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name:  wheels-linux-aarch64-${{ matrix.pyver }}
           path: ./wheelhouse/*.whl

.github/workflows/unit_test.yml

@@ -21,34 +21,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, macos-12, ubuntu-latest]
+        os: [windows-latest, ubuntu-latest, macos-latest]
         include:
-          - os: windows-2022
-            sys_pkgs: choco install swig
+          - os: windows-latest
             activate: ./build-env/Scripts/activate
 
-          - os: macos-12
-            sys_pkgs: brew install swig ninja
+          - os: macos-latest
             activate: source ./build-env/bin/activate
 
           - os: ubuntu-latest
             activate: source ./build-env/bin/activate
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
-
-      - name: Install required system packages
-        run: ${{matrix.sys_pkgs}}
+          python-version: "3.10"
 
       - name: Build wheel in virtual env
+        env:
+          MACOSX_DEPLOYMENT_TARGET: "11.0"
         run: |
           python -m venv --clear ./build-env
           ${{matrix.activate}}
@@ -60,4 +57,4 @@ jobs:
         run: |
           pip install -r test-requirements.txt
           pip install --no-index --find-links=./dist swmm_toolkit
-          pytest
+          pytest

swmm-toolkit/CMakeLists.txt

@@ -2,7 +2,7 @@
 # CMakeLists.txt - CMake configuration file for swmm-toolkit python package
 #
 # Created:   Feb 6, 2020
-# Modified   Jun 7, 2021
+# Modified   Sep 2, 2025
 #
 #  Author:   See AUTHORS
 #
@@ -11,7 +11,7 @@
 ##################    CMAKELISTS FOR SWMM-TOOLKIT PROJECT    ###################
 ################################################################################
 
-cmake_minimum_required (VERSION 3.17)
+cmake_minimum_required (VERSION 4.0.2)
 
 project(swmm-toolkit
     VERSION
@@ -36,16 +36,6 @@ cmake_policy(SET CMP0078 NEW)
 cmake_policy(SET CMP0086 NEW)
 include(${SWIG_USE_FILE})
 
-# If wheel build on Apple fetch and build OpenMP Library
-if (APPLE)
-    include(./extern/openmp.cmake)
-else()
-    find_package(OpenMP
-        REQUIRED
-        OPTIONAL_COMPONENTS
-            C
-    )
-endif()
 
 # Add project subdirectories
 add_subdirectory(swmm-solver)

swmm-toolkit/build-requirements.txt

@@ -1,8 +1,8 @@
 
 
 
-setuptools   == 65.5.1
-wheel        == 0.38.1
-scikit-build == 0.11.1
-cmake        == 3.21
-swig         == 4.0.2
+setuptools
+wheel
+scikit-build
+cmake
+swig