Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging release v0.15.4 #132

Merged
merged 8 commits into from
Apr 12, 2024
Merged

Staging release v0.15.4 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b92a146
Added statement to check if symbolic_name already exists in shared_en…
Mar 6, 2024
f044107
Merge pull request #131 from stroutm/dev
bemcdonnell Apr 12, 2024
4b28a7e
bumping version v0.15.4
Apr 12, 2024
c151193
fix: update cibuildwheel
karosc Apr 12, 2024
1f5b004
fix pipeline: remove system swig before building wheel
karosc Apr 12, 2024
5dd041f
fix: debug actions
karosc Apr 12, 2024
3f24358
fix: debug actions
karosc Apr 12, 2024
0d580c2
fix: debug cross build wheel
karosc Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/build_wheel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,17 @@ jobs:
submodules: true

- name: Build wheels
uses: pypa/cibuildwheel@v2.16.2
uses: pypa/cibuildwheel@v2.17.0
with:
package-dir: ./swmm-toolkit
env:
CIBW_TEST_COMMAND: "pytest {package}/tests"
CIBW_BEFORE_TEST: pip install -r {package}/test-requirements.txt
# mac needs ninja to build
CIBW_BEFORE_BUILD_MACOS: brew install ninja
# remove system swig (cmake bug doesn't respect python venv)
# https://github.com/swig/swig/issues/2481#issuecomment-1949573105
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: x86_64
CIBW_ARCHS_WINDOWS: AMD64
Expand Down Expand Up @@ -102,10 +105,13 @@ jobs:
platforms: all

- name: Build wheels
uses: pypa/cibuildwheel@v2.16.2
uses: pypa/cibuildwheel@v2.17.0
with:
package-dir: ./swmm-toolkit
env:
# remove system swig (cmake bug doesn't respect python venv)
# https://github.com/swig/swig/issues/2481#issuecomment-1949573105
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
Expand Down
3 changes: 2 additions & 1 deletion swmm-toolkit/AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ Caleb Buahin <[email protected]>
Laurent Courty <[email protected]>
Constantine Karos <[email protected]>
Abhiram Mullapudi <[email protected]>
Brooke Mason <[email protected]>
Brooke Mason <[email protected]>
Sara C. Troutman <[email protected]>
2 changes: 1 addition & 1 deletion swmm-toolkit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cmake_minimum_required (VERSION 3.17)

project(swmm-toolkit
VERSION
0.15.3
0.15.4
)


Expand Down
2 changes: 1 addition & 1 deletion swmm-toolkit/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def exclude_files(cmake_manifest):

setup(
name = "swmm-toolkit",
version = "0.15.3",
version = "0.15.4",

packages = ["swmm_toolkit", "swmm.toolkit"],
package_dir = package_dir,
Expand Down
2 changes: 1 addition & 1 deletion swmm-toolkit/src/swmm/toolkit/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
__credits__ = "Colleen Barr, Sam Hatchett"
__license__ = "CC0 1.0 Universal"

__version__ = "0.15.2"
__version__ = "0.15.4"
__date__ = "June 7, 2021"

__maintainer__ = "Michael Tryby"
Expand Down
7 changes: 4 additions & 3 deletions swmm-toolkit/src/swmm/toolkit/output_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,10 @@ def _build_pollut_metadata(self, output_handle):
# Create dictionary keys
for i in range(1, n):
symbolic_name = 'POLLUT_CONC_' + str(i)
extend_enum(shared_enum.SubcatchAttribute, symbolic_name, 8 + i)
extend_enum(shared_enum.NodeAttribute, symbolic_name, 6 + i)
extend_enum(shared_enum.LinkAttribute, symbolic_name, 5 + i)
if symbolic_name not in shared_enum.SubcatchAttribute._member_names_:
extend_enum(shared_enum.SubcatchAttribute, symbolic_name, 8 + i)
extend_enum(shared_enum.NodeAttribute, symbolic_name, 6 + i)
extend_enum(shared_enum.LinkAttribute, symbolic_name, 5 + i)

# Update metadata dictionary with pollutant metadata
for i, attr in enumerate(islice(shared_enum.SubcatchAttribute, 8, None)):
Expand Down
Loading