Skip to content

Commit faa4ec4

Browse files
bemcdonnellbemcdonnell
authored
Merge pull request #147 from pyswmm/dev
Staging Release
2 parents 4ca71f7 + b699a6e commit faa4ec4

File tree

17 files changed

+113
-509
lines changed

17 files changed

+113
-509
lines changed

‎.github/workflows/build_wheel.yml‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repo
25-
uses: actions/checkout@v3
26-
with:
27-
submodules: true
25+
uses: actions/checkout@v5
2826

2927
- name: Install Python
30-
uses: actions/setup-python@v4
28+
uses: actions/setup-python@v5
3129
with:
32-
python-version: 3.7
30+
python-version: '3.10'
3331

3432
- name: Build wheel
3533
run: |
3634
pip install wheel
3735
python setup.py bdist_wheel
38-
- uses: actions/upload-artifact@v3
36+
37+
- name: Upload wheel artifact
38+
uses: actions/upload-artifact@v4
3939
with:
40+
name: nrtest-swmm-wheel
4041
path: nrtest-swmm/dist/*.whl
41-
42-
42+
4343

4444
build_wheels:
4545
runs-on: ${{ matrix.os }}
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
os: [ubuntu-latest, windows-2022, macos-12]
50-
pyver: [cp38, cp39, cp310, cp311, cp312]
49+
os: [ubuntu-latest, windows-latest, macos-latest]
50+
pyver: [cp39, cp310, cp311, cp312, cp313]
5151

5252
steps:
5353
- name: Checkout repo
@@ -56,10 +56,11 @@ jobs:
5656
submodules: true
5757

5858
- name: Build wheels
59-
uses: pypa/cibuildwheel@v2.17.0
59+
uses: pypa/cibuildwheel@v3.1.4
6060
with:
6161
package-dir: ./swmm-toolkit
6262
env:
63+
MACOSX_DEPLOYMENT_TARGET: "11.0"
6364
CIBW_TEST_COMMAND: "pytest {package}/tests"
6465
CIBW_BEFORE_TEST: pip install -r {package}/test-requirements.txt
6566
# mac needs ninja to build
@@ -70,31 +71,31 @@ jobs:
7071
# configure cibuildwheel to build native archs ('auto'), and some emulated ones
7172
CIBW_ARCHS_LINUX: x86_64
7273
CIBW_ARCHS_WINDOWS: AMD64
73-
CIBW_ARCHS_MACOS: x86_64
74+
CIBW_ARCHS_MACOS: x86_64 arm64
7475
# only build current supported python: https://devguide.python.org/versions/
7576
# don't build pypy or musllinux to save build time. TODO: find a good way to support those archs
7677
CIBW_BUILD: ${{matrix.pyver}}-*
77-
CIBW_SKIP: cp36-* cp37-* pp* *-musllinux*
78+
CIBW_SKIP: cp38-* pp* *-musllinux*
7879
# Will avoid testing on emulated architectures
7980
# Skip trying to test arm64 builds on Intel Macs
80-
CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64"
81+
CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_universal2:arm64"
8182
CIBW_BUILD_VERBOSITY: 1
8283

83-
- uses: actions/upload-artifact@v3
84+
- uses: actions/upload-artifact@v4
8485
with:
86+
name: wheels-${{ matrix.os }}-${{ matrix.pyver }}
8587
path: ./wheelhouse/*.whl
8688

8789
build_cross_wheels:
88-
runs-on: ${{ matrix.os }}
90+
runs-on: ubuntu-latest
8991
strategy:
9092
fail-fast: false
9193
matrix:
92-
os: [ubuntu-latest,macos-12]
93-
pyver: [cp38, cp39, cp310, cp311, cp312]
94+
pyver: [cp39, cp310, cp311, cp312, cp313]
9495

9596
steps:
9697
- name: Checkout repo
97-
uses: actions/checkout@v3
98+
uses: actions/checkout@v5
9899
with:
99100
submodules: true
100101

@@ -105,7 +106,7 @@ jobs:
105106
platforms: all
106107

107108
- name: Build wheels
108-
uses: pypa/cibuildwheel@v2.17.0
109+
uses: pypa/cibuildwheel@v3.1.4
109110
with:
110111
package-dir: ./swmm-toolkit
111112
env:
@@ -114,13 +115,13 @@ jobs:
114115
CIBW_BEFORE_BUILD_LINUX: rm -f $(which swig) && rm -f $(which swig4.0)
115116
# configure cibuildwheel to build native archs ('auto'), and some emulated ones
116117
CIBW_ARCHS_LINUX: aarch64
117-
CIBW_ARCHS_MACOS: arm64
118118
# only build current supported python: https://devguide.python.org/versions/
119119
# don't build pypy or musllinux to save build time. TODO: find a good way to support those archs
120120
CIBW_BUILD: ${{matrix.pyver}}-*
121-
CIBW_SKIP: cp36-* cp37-* pp* *-musllinux*
121+
CIBW_SKIP: cp-*38 pp* *-musllinux*
122122
CIBW_BUILD_VERBOSITY: 1
123123

124-
- uses: actions/upload-artifact@v3
124+
- uses: actions/upload-artifact@v4
125125
with:
126+
name: wheels-linux-aarch64-${{ matrix.pyver }}
126127
path: ./wheelhouse/*.whl

‎.github/workflows/unit_test.yml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,31 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
os: [windows-2022, macos-12, ubuntu-latest]
24+
os: [windows-latest, ubuntu-latest, macos-latest]
2525
include:
26-
- os: windows-2022
27-
sys_pkgs: choco install swig
26+
- os: windows-latest
2827
activate: ./build-env/Scripts/activate
2928

30-
- os: macos-12
31-
sys_pkgs: brew install swig ninja
29+
- os: macos-latest
3230
activate: source ./build-env/bin/activate
3331

3432
- os: ubuntu-latest
3533
activate: source ./build-env/bin/activate
3634

3735
steps:
3836
- name: Checkout repo
39-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
4038
with:
4139
submodules: true
4240

4341
- name: Install Python
44-
uses: actions/setup-python@v4
42+
uses: actions/setup-python@v5
4543
with:
46-
python-version: "3.11"
47-
48-
- name: Install required system packages
49-
run: ${{matrix.sys_pkgs}}
44+
python-version: "3.10"
5045

5146
- name: Build wheel in virtual env
47+
env:
48+
MACOSX_DEPLOYMENT_TARGET: "11.0"
5249
run: |
5350
python -m venv --clear ./build-env
5451
${{matrix.activate}}
@@ -60,4 +57,4 @@ jobs:
6057
run: |
6158
pip install -r test-requirements.txt
6259
pip install --no-index --find-links=./dist swmm_toolkit
63-
pytest
60+
pytest

‎swmm-toolkit/AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
Michael Tryby <[email protected]> (public domain)
44

5+
Michael Tryby <[email protected]>
56
Jennifer Wu <[email protected]>
67
Caleb Buahin <[email protected]>
78
Laurent Courty <[email protected]>

‎swmm-toolkit/CMakeLists.txt‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# CMakeLists.txt - CMake configuration file for swmm-toolkit python package
33
#
44
# Created: Feb 6, 2020
5-
# Modified Jun 7, 2021
5+
# Modified Sep 2, 2025
66
#
77
# Author: See AUTHORS
88
#
@@ -11,7 +11,7 @@
1111
################## CMAKELISTS FOR SWMM-TOOLKIT PROJECT ###################
1212
################################################################################
1313

14-
cmake_minimum_required (VERSION 3.17)
14+
cmake_minimum_required (VERSION 4.0.2)
1515

1616
project(swmm-toolkit
1717
VERSION
@@ -36,16 +36,6 @@ cmake_policy(SET CMP0078 NEW)
3636
cmake_policy(SET CMP0086 NEW)
3737
include(${SWIG_USE_FILE})
3838

39-
# If wheel build on Apple fetch and build OpenMP Library
40-
if (APPLE)
41-
include(./extern/openmp.cmake)
42-
else()
43-
find_package(OpenMP
44-
REQUIRED
45-
OPTIONAL_COMPONENTS
46-
C
47-
)
48-
endif()
4939

5040
# Add project subdirectories
5141
add_subdirectory(swmm-solver)

‎swmm-toolkit/build-requirements.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22

33

4-
setuptools == 65.5.1
5-
wheel == 0.38.1
6-
scikit-build == 0.11.1
7-
cmake == 3.21
8-
swig == 4.0.2
4+
setuptools
5+
wheel
6+
scikit-build
7+
cmake
8+
swig

0 commit comments

Comments
 (0)