Skip to content

add ninja to build requirements #125

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

Merged
merged 3 commits into from
Sep 27, 2023
Merged

add ninja to build requirements #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b58c3f3
add ninja to build requirements
karosc Sep 26, 2023
b2e8b38
set release version
karosc Sep 26, 2023
82e23b3
install ninja from pip instead of brew
karosc Sep 27, 2023
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
2 changes: 0 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 @@ -106,8 +106,6 @@ jobs:
with:
package-dir: ./swmm-toolkit
env:
# mac needs ninja to build
CIBW_BEFORE_BUILD_MACOS: brew install ninja
# configure cibuildwheel to build native archs ('auto'), and some emulated ones
CIBW_ARCHS_LINUX: aarch64
CIBW_ARCHS_MACOS: arm64
Expand Down
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.1
0.15.2
)


Expand Down
1 change: 1 addition & 0 deletions swmm-toolkit/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ requires = [
"scikit-build>=0.13",
"cmake>=3.21",
"swig==4.0.2",
"ninja==1.11.1 ; sys_platform == 'darwin'"
]
build-backend = "setuptools.build_meta"
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.1",
version = "0.15.2",

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.1"
__version__ = "0.15.2"
__date__ = "June 7, 2021"

__maintainer__ = "Michael Tryby"
Expand Down