From 1386d7cd557420f018ae29d6ac9e414c98e0f989 Mon Sep 17 00:00:00 2001 From: jtgrasb <87095491+jtgrasb@users.noreply.github.com> Date: Fri, 31 Oct 2025 11:41:14 -0600 Subject: [PATCH 1/5] remove numpy restrictions and use old coverage method --- .github/workflows/pr.yml | 4 ++-- .github/workflows/push.yml | 4 ++-- pyproject.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7e9d9ca52..26c6993ca 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c629bc69e..80dcc3046 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -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 diff --git a/pyproject.toml b/pyproject.toml index 569cac90e..44a830e7b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "numpy>=1.20, <2.0", + "numpy", "scipy", "xarray", "jax", From c2a3e36bdcf9dc7b0514773ed5e0ceedb1e3c840 Mon Sep 17 00:00:00 2001 From: jtgrasb <87095491+jtgrasb@users.noreply.github.com> Date: Fri, 31 Oct 2025 12:23:44 -0600 Subject: [PATCH 2/5] add source in toml --- pyproject.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 44a830e7b..598ee29d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,3 +50,8 @@ geometry = [ "gmsh", "pygmsh", ] + +[tool.coverage.run] +source = [ + "wecopttool", +] \ No newline at end of file From dbc9fcf6fbcd0bdf52c8133ed4f573bcc79eb5fd Mon Sep 17 00:00:00 2001 From: jtgrasb <87095491+jtgrasb@users.noreply.github.com> Date: Tue, 4 Nov 2025 08:01:29 -0700 Subject: [PATCH 3/5] fix numpy nan --- examples/tutorial_2_AquaHarmonics.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tutorial_2_AquaHarmonics.ipynb b/examples/tutorial_2_AquaHarmonics.ipynb index d2b1a009c..e12193bdb 100644 --- a/examples/tutorial_2_AquaHarmonics.ipynb +++ b/examples/tutorial_2_AquaHarmonics.ipynb @@ -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", From 5d01870fe95204271f349c4333eb04712f0645b8 Mon Sep 17 00:00:00 2001 From: jtgrasb <87095491+jtgrasb@users.noreply.github.com> Date: Wed, 12 Nov 2025 08:53:39 -0700 Subject: [PATCH 4/5] numpy 1.20+ --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 598ee29d8..2cb76679e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "numpy", + "numpy>=1.20", "scipy", "xarray", "jax", From c3911391435feb7d0a13e9c7b632f5bf59d4641c Mon Sep 17 00:00:00 2001 From: jtgrasb <87095491+jtgrasb@users.noreply.github.com> Date: Wed, 19 Nov 2025 14:09:29 -0700 Subject: [PATCH 5/5] update version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2cb76679e..fbf9cafd8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 = [