From ad1c88e3e3f8e0f10408391f00838d602f776deb Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 11:59:54 -0400
Subject: [PATCH 01/24] Bump checkout and setup-python actions

---
 .github/workflows/build_wheel.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index b1f88473..ad7ff71a 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -22,14 +22,12 @@ 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.10
+          python-version: '3.10'
 
       - name: Build wheel
         run: |

From 6e5ef9b2de373e59c8f902f4109f793fe275b053 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 12:21:33 -0400
Subject: [PATCH 02/24] Enhance artifact handling

---
 .github/workflows/build_wheel.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index ad7ff71a..e394c544 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -33,11 +33,16 @@ jobs:
         run: |
             pip install wheel
             python setup.py bdist_wheel
-      - uses: actions/upload-artifact@v4
-        with:
-          path: nrtest-swmm/dist/*.whl
-
 
+      - name: Get wheel filename
+        run: echo "artifact_name=$(ls dist/*.whl | xargs -n1 basename)" >> $GITHUB_OUTPUT
+    
+      - name: Upload wheel artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.get_wheel.outputs.artifact_name }}
+          path: dist/*.whl
+  
 
   build_wheels:
     runs-on: ${{ matrix.os }}

From e31109c8ea3fa6229414c46aa3becaf5ea50f422 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 12:28:18 -0400
Subject: [PATCH 03/24] Fix wheel artifact upload path in workflow

---
 .github/workflows/build_wheel.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index e394c544..a6bc9c1b 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -40,8 +40,7 @@ jobs:
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.get_wheel.outputs.artifact_name }}
-          path: dist/*.whl
+          path: dist/${{ steps.get_wheel.outputs.artifact_name }}.whl
   
 
   build_wheels:

From bd59d64809f5501804c4c7e04300954beb13ffa3 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 12:38:12 -0400
Subject: [PATCH 04/24] Fix wheel artifact upload path in workflow

---
 .github/workflows/build_wheel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index a6bc9c1b..6d7037c4 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
-          path: dist/${{ steps.get_wheel.outputs.artifact_name }}.whl
+          path: dist/${{ steps.get_wheel.outputs.artifact_name }}
   
 
   build_wheels:

From dca2b013fcdfa93ea8766712801c6d1b18c1a4c6 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 12:39:44 -0400
Subject: [PATCH 05/24] Fix wheel filename retrieval in workflow

---
 .github/workflows/build_wheel.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 6d7037c4..38027a36 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -35,12 +35,13 @@ jobs:
             python setup.py bdist_wheel
 
       - name: Get wheel filename
-        run: echo "artifact_name=$(ls dist/*.whl | xargs -n1 basename)" >> $GITHUB_OUTPUT
+        id: get_wheel 
+        run: echo "artifact_name=$( ls dist/*.whl )" >> $GITHUB_OUTPUT
     
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
-          path: dist/${{ steps.get_wheel.outputs.artifact_name }}
+          path: ${{ steps.get_wheel.outputs.artifact_name }}
   
 
   build_wheels:

From efd6d42d5eb13cabad71b607f732cbb5ff7262e0 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 12:43:40 -0400
Subject: [PATCH 06/24] Fix path for wheel artifact upload

---
 .github/workflows/build_wheel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 38027a36..da11b436 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
-          path: ${{ steps.get_wheel.outputs.artifact_name }}
+          path: ./${{ steps.get_wheel.outputs.artifact_name }}
   
 
   build_wheels:

From d3f218872ef29b30832d34e66b1281491bd42cb8 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 12:51:35 -0400
Subject: [PATCH 07/24] Fix path for wheel artifact upload in workflow

---
 .github/workflows/build_wheel.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index da11b436..20dddcab 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -36,12 +36,14 @@ jobs:
 
       - name: Get wheel filename
         id: get_wheel 
-        run: echo "artifact_name=$( ls dist/*.whl )" >> $GITHUB_OUTPUT
+        run: |
+            echo "PWD=$PWD"
+            echo "artifact_name=$( ls dist/*.whl )" >> $GITHUB_OUTPUT
     
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
-          path: ./${{ steps.get_wheel.outputs.artifact_name }}
+          path: $PWD/${{ steps.get_wheel.outputs.artifact_name }}
   
 
   build_wheels:

From eeab848d8124edf50486332036d85f1d5024f911 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 13:04:07 -0400
Subject: [PATCH 08/24] Fix artifact name handling in build_wheel.yml

---
 .github/workflows/build_wheel.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 20dddcab..ae8f9e51 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -38,12 +38,13 @@ jobs:
         id: get_wheel 
         run: |
             echo "PWD=$PWD"
-            echo "artifact_name=$( ls dist/*.whl )" >> $GITHUB_OUTPUT
+            echo "artifact_name=$( ls dist/*.whl | xargs -n1 basename )" >> $GITHUB_OUTPUT
     
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
-          path: $PWD/${{ steps.get_wheel.outputs.artifact_name }}
+          name: name: ${{ steps.get_wheel.outputs.artifact_name }}
+          path: dist/*.whl
   
 
   build_wheels:

From 6ec115047cdaf78c3d991db6e7df8ad978366d83 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 13:05:11 -0400
Subject: [PATCH 09/24] Simplify get_wheel step in build_wheel.yml

Remove unnecessary echo command for PWD.
---
 .github/workflows/build_wheel.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index ae8f9e51..79c5131b 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -37,7 +37,6 @@ jobs:
       - name: Get wheel filename
         id: get_wheel 
         run: |
-            echo "PWD=$PWD"
             echo "artifact_name=$( ls dist/*.whl | xargs -n1 basename )" >> $GITHUB_OUTPUT
     
       - name: Upload wheel artifact

From 61e659bbcac5afb13d4583d0334fd7a31ce9435f Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 13:08:05 -0400
Subject: [PATCH 10/24] Fix syntax error in artifact upload step

---
 .github/workflows/build_wheel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 79c5131b..99ab2d34 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
-          name: name: ${{ steps.get_wheel.outputs.artifact_name }}
+          name: ${{ steps.get_wheel.outputs.artifact_name }}
           path: dist/*.whl
   
 

From 3a68736c0cca176548393990ddcc32b366548d27 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 13:12:47 -0400
Subject: [PATCH 11/24] Update wheel artifact upload path in workflow

---
 .github/workflows/build_wheel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 99ab2d34..db355086 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.get_wheel.outputs.artifact_name }}
-          path: dist/*.whl
+          path: nrtest-swmm/dist/*.whl
   
 
   build_wheels:

From cf51a66cf0de31dd957ab03c475332e386c49d80 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 16:45:10 -0400
Subject: [PATCH 12/24] Update wheel artifact upload step in workflow

Removed step to get wheel filename and set a static name for the uploaded artifact.
---
 .github/workflows/build_wheel.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index db355086..ba624e34 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -33,16 +33,11 @@ jobs:
         run: |
             pip install wheel
             python setup.py bdist_wheel
-
-      - name: Get wheel filename
-        id: get_wheel 
-        run: |
-            echo "artifact_name=$( ls dist/*.whl | xargs -n1 basename )" >> $GITHUB_OUTPUT
     
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.get_wheel.outputs.artifact_name }}
+          name: nrtest-swmm-wheel
           path: nrtest-swmm/dist/*.whl
   
 

From 2ab1a856548c100f035872228918a3ca3b2a24dd Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 16:54:59 -0400
Subject: [PATCH 13/24] Update artifact name for wheel uploads

---
 .github/workflows/build_wheel.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index ba624e34..f71f6a13 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -82,6 +82,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: wheels-${{ matrix.os }}-${{ matrix.py }}
           path: ./wheelhouse/*.whl
 
   build_cross_wheels:

From 32f5ae9232ee84cd1da90e9e22cdd7921db71f0f Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 16:57:07 -0400
Subject: [PATCH 14/24] Update wheel artifact name to include python version

---
 .github/workflows/build_wheel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index f71f6a13..a661c9ec 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -82,7 +82,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.os }}-${{ matrix.py }}
+          name: wheels-${{ matrix.os }}-${{ matrix.pyver }}
           path: ./wheelhouse/*.whl
 
   build_cross_wheels:

From 91108e270b911ad973d43adddb3e12051efb4d51 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 17:07:52 -0400
Subject: [PATCH 15/24] Update macOS deployment target and skip Python versions

---
 .github/workflows/build_wheel.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index a661c9ec..2723c1e5 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -60,6 +60,7 @@ jobs:
         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
@@ -74,7 +75,7 @@ jobs:
           # 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"

From e2aaa241eec6bfee0c288c03e662beb01cc3d6c9 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 17:08:50 -0400
Subject: [PATCH 16/24] Update cmake_args for macOS in setup.py

Remove deployment target specification for macOS in setup.py.
---
 swmm-toolkit/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swmm-toolkit/setup.py b/swmm-toolkit/setup.py
index 6d1fa3cc..7feeb1e2 100644
--- a/swmm-toolkit/setup.py
+++ b/swmm-toolkit/setup.py
@@ -88,7 +88,7 @@ def run(self):
     cmake_args = ["-GVisual Studio 17 2022","-Ax64"]
 
 elif platform_system == "Darwin":
-    cmake_args = ["-GXcode","-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.0"]
+    cmake_args = ["-GXcode"]
 
 else:
     cmake_args = ["-GUnix Makefiles"]

From a0f808dff60168f083787e93a09234130d96a431 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 17:16:05 -0400
Subject: [PATCH 17/24] Add MACOSX_DEPLOYMENT_TARGET to unit test workflow

Set MACOSX_DEPLOYMENT_TARGET environment variable for building wheel.
---
 .github/workflows/unit_test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index ae4fbdd0..c6d6ecf7 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -44,6 +44,8 @@ jobs:
           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}}

From 5da0156a58dfa39331f76ccfab0904cf41d8dde6 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 17:18:11 -0400
Subject: [PATCH 18/24] Change macOS architecture from x86_64 to arm64

---
 .github/workflows/build_wheel.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 2723c1e5..c0a07eea 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -71,14 +71,14 @@ 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: 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: 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_x86_64 *-macosx_universal2:arm64"
           CIBW_BUILD_VERBOSITY: 1
 
       - uses: actions/upload-artifact@v4

From a5178ae4799263dbec604bc0358bbe1bcf800f0b Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 17:21:16 -0400
Subject: [PATCH 19/24] Fix MACOSX_DEPLOYMENT_TARGET format in workflow

---
 .github/workflows/unit_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index c6d6ecf7..4a830649 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: Build wheel in virtual env
         env:
-          MACOSX_DEPLOYMENT_TARGET: 11.0
+          MACOSX_DEPLOYMENT_TARGET: "11.0"
         run: |
           python -m venv --clear ./build-env
           ${{matrix.activate}}

From 083390b0bc4acd4e6f49570a15c9539d2a968adf Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 17:25:59 -0400
Subject: [PATCH 20/24] Change MACOSX_DEPLOYMENT_TARGET to string format

---
 .github/workflows/build_wheel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index c0a07eea..58b8d395 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -60,7 +60,7 @@ jobs:
         with:
           package-dir: ./swmm-toolkit
         env:
-          MACOSX_DEPLOYMENT_TARGET: 11.0
+          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

From f77c28d8de2a749026cda4b11ac9c737eb6f5e22 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 20:42:28 -0400
Subject: [PATCH 21/24] Update macOS architecture settings in build workflow

---
 .github/workflows/build_wheel.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 58b8d395..25d19248 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -71,14 +71,14 @@ jobs:
           # configure cibuildwheel to build native archs ('auto'), and some emulated ones
           CIBW_ARCHS_LINUX: x86_64
           CIBW_ARCHS_WINDOWS: AMD64
-          CIBW_ARCHS_MACOS: arm64
+          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: 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_x86_64 *-macosx_universal2:arm64"
+          CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_universal2:arm64"
           CIBW_BUILD_VERBOSITY: 1
 
       - uses: actions/upload-artifact@v4

From 4de8ffaaff0562877c8cb31e15c8ba269a9197d9 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 20:55:56 -0400
Subject: [PATCH 22/24] Update GitHub Actions workflow for building wheels

---
 .github/workflows/build_wheel.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 25d19248..ef4046cf 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -87,16 +87,15 @@ jobs:
           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]
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
             submodules: true
 
@@ -116,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-* cp-*38 pp* *-musllinux*
+          CIBW_SKIP: cp-*38 pp* *-musllinux*
           CIBW_BUILD_VERBOSITY: 1
 
       - uses: actions/upload-artifact@v4
         with:
+          name:  wheels-linux-aarch64-${{ matrix.pyver }}
           path: ./wheelhouse/*.whl

From b08774ab70b0c11cdacfea7339c15a61122f423f Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Sun, 31 Aug 2025 21:01:01 -0400
Subject: [PATCH 23/24] Add Python 3.13 to build matrix in workflows

---
 .github/workflows/build_wheel.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index ef4046cf..92fa2f8c 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -47,7 +47,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        pyver: [cp39, cp310, cp311, cp312]
+        pyver: [cp39, cp310, cp311, cp312, cp313]
 
     steps:
       - name: Checkout repo
@@ -91,7 +91,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [cp38, cp39, cp310, cp311, cp312]
+        pyver: [cp39, cp310, cp311, cp312, cp313]
 
     steps:
       - name: Checkout repo

From a620d26f19f83f967334951a9a75428049229705 Mon Sep 17 00:00:00 2001
From: Michael Tryby <michael.tryby@gmail.com>
Date: Mon, 1 Sep 2025 10:57:06 -0400
Subject: [PATCH 24/24] Update test requirements for pytest and numpy

---
 swmm-toolkit/test-requirements.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/swmm-toolkit/test-requirements.txt b/swmm-toolkit/test-requirements.txt
index 0cc9aaba..812ef65c 100644
--- a/swmm-toolkit/test-requirements.txt
+++ b/swmm-toolkit/test-requirements.txt
@@ -1,8 +1,8 @@
 
 
 
-pytest == 7.1.1
-numpy  == 1.21.6; python_version == "3.7"
-numpy  == 1.24.4; python_version < "3.12"
-numpy  == 1.26.2; python_version >= "3.12"
+pytest == 8.4.1
+numpy  == 2.0.2; python_version < "3.10"
+numpy  == 2.2.6; python_version == "3.10.*"
+numpy  == 2.3.2; python_version >= "3.11"
 aenum  == 3.1.11