Skip to content

Remove the numpy restrictions and fix issues with coverage/coveralls #443

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
jtgrasb merged 5 commits into from
Nov 19, 2025
Merged

Remove the numpy restrictions and fix issues with coverage/coveralls #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1386d7c
remove numpy restrictions and use old coverage method
jtgrasb Oct 31, 2025
c2a3e36
add source in toml
jtgrasb Oct 31, 2025
dbc9fcf
fix numpy nan
jtgrasb Nov 4, 2025
5d01870
numpy 1.20+
jtgrasb Nov 12, 2025
c391139
update version
jtgrasb Nov 19, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ jobs:
run: |
conda activate test-env
python3 -m pip install --upgrade pip
pip3 install gmsh pygmsh coveralls pytest pytest-cov
pip3 install gmsh pygmsh coveralls pytest
pip3 install .

# run all tests & coverage
- name: Run Test
shell: bash -l {0}
run: pytest --cov=wecopttool --cov-report=xml
run: coverage run -m pytest

# upload coverage data
- name: Upload coverage data to coveralls.io
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ jobs:
run: |
conda activate test-env
python3 -m pip install --upgrade pip
pip3 install gmsh pygmsh coveralls pytest pytest-cov
pip3 install gmsh pygmsh coveralls pytest
pip3 install .

# run all tests & coverage
- name: Run Test
shell: bash -l {0}
run: pytest --cov=wecopttool --cov-report=xml
run: coverage run -m pytest

# upload coverage data
- name: Upload coverage data to coveralls.io
Expand Down
2 changes: 1 addition & 1 deletion examples/tutorial_2_AquaHarmonics.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
"y = np.arange(-1*torque_max, 1.0*torque_max, 5)\n",
"X, Y = np.meshgrid(x, y)\n",
"Z = power_loss(X, Y).copy()/1e3\n",
"Z[np.abs(X*Y) > power_max] = np.NaN # cut off area outside of power limit\n",
"Z[np.abs(X*Y) > power_max] = np.nan # cut off area outside of power limit\n",
"\n",
"fig = plt.figure(figsize=plt.figaspect(0.4))\n",
"ax = [fig.add_subplot(1, 2, 1, projection=\"3d\"),\n",
Expand Down
9 changes: 7 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "wecopttool"
version = "3.2.0"
version = "3.2.1"
description = "WEC Design Optimization Toolbox"
readme = "README.md"
authors = [
Expand All @@ -19,7 +19,7 @@ classifiers = [
"Operating System :: OS Independent",
]
dependencies = [
"numpy>=1.20, <2.0",
"numpy>=1.20",
"scipy",
"xarray",
"jax",
Expand Down Expand Up @@ -50,3 +50,8 @@ geometry = [
"gmsh",
"pygmsh",
]

[tool.coverage.run]
source = [
"wecopttool",
]
Loading