From 47470a84066506ff2828d260784f917bd45a8c09 Mon Sep 17 00:00:00 2001 From: "Simms, Andrew" Date: Fri, 7 Aug 2026 14:02:11 -0600 Subject: [PATCH 1/3] Dependencies: Revert to older version of NREL-rex --- environment-dev.yml | 7 +------ pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/environment-dev.yml b/environment-dev.yml index 455c8eae..f37dcb7f 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -27,9 +27,4 @@ dependencies: - matplotlib>=3.9.1 - fatpack - cartopy - # rex is installed from PyPI (NLR-rex), not conda-forge. The conda-forge - # `nrel-rex` is frozen at 0.2.84, which predates the s3:// fsspec support - # needed to read the wave hindcast .h5 files directly from S3. The [hsds] extra - # pulls the HSDS client dependencies the hindcast reads use. - - pip: - - NLR-rex[hsds]>=0.5.0 + - NREL-rex diff --git a/pyproject.toml b/pyproject.toml index 02386a2b..c3e59ce6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,7 @@ wave = [ "scikit-learn>=1.5.1", "statsmodels>=0.14.2", "pytz", - "NLR-rex[hsds]>=0.5.0", + "NREL-rex", "beautifulsoup4", "bottleneck", "lxml", From 64bf4c85d8e5574bc3b2a9c2552ad47eb5847d42 Mon Sep 17 00:00:00 2001 From: "Simms, Andrew" Date: Fri, 7 Aug 2026 14:08:13 -0600 Subject: [PATCH 2/3] Actions: Add windows "basic" install check --- .github/workflows/main.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20896457..f0f88034 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -527,6 +527,30 @@ jobs: run: | python -m pytest -c .github/workflows/pytest.ini mhkit/tests/${{ matrix.module }}/ + windows-wheel-check: + # Verifies each mhkit extras group can be installed on Windows from prebuilt wheels alone, + # which is intented to mimic a user without windows MSVC compilers installed + runs-on: windows-latest + strategy: + fail-fast: false + matrix: + module: + [wave, tidal, river, dolfyn, power, loads, mooring, acoustics, utils, all] + python-version: ['3.13'] + + steps: + - uses: actions/checkout@v6 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python-version }} + + - name: Check ${{ matrix.module }} extra installs from wheels only on Windows + run: | + python -m pip install --upgrade pip + pip download --dest wheelhouse --only-binary=:all: --no-binary mhkit ".[${{ matrix.module }}]" + notebook-matrix: runs-on: ubuntu-latest needs: From 3fa2ec331d0547b7ffa465e37fd33226ffe85ed5 Mon Sep 17 00:00:00 2001 From: "Simms, Andrew" Date: Fri, 7 Aug 2026 15:15:00 -0600 Subject: [PATCH 3/3] Release: v1.1.2, dependency fixes --- mhkit/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhkit/__init__.py b/mhkit/__init__.py index c1c1f3e1..5e699266 100644 --- a/mhkit/__init__.py +++ b/mhkit/__init__.py @@ -11,7 +11,7 @@ configure_warnings() -__version__ = "v1.1.1" +__version__ = "v1.1.2" __copyright__ = """ Copyright 2019, Alliance for Energy Innovation, LLC under the terms of