Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 19 additions & 19 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Py 3.10, 3.11, 3.12 | Windows Mac Linux
name: Py 3.10, 3.11, 3.12, 3.13 | Windows Mac Linux

on:
pull_request:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
uses: actions/checkout@v6

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
uses: conda-incubator/setup-miniconda@v4
with:
miniconda-version: ${{ env.CONDA_MINICONDA_VERSION }}
auto-update-conda: ${{ env.CONDA_AUTO_UPDATE_CONDA }}
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
uses: actions/checkout@v6

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
uses: conda-incubator/setup-miniconda@v4
with:
miniconda-version: ${{ env.CONDA_MINICONDA_VERSION }}
auto-update-conda: ${{ env.CONDA_AUTO_UPDATE_CONDA }}
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
uses: actions/checkout@v6

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
uses: conda-incubator/setup-miniconda@v4
with:
miniconda-version: ${{ env.CONDA_MINICONDA_VERSION }}
auto-update-conda: ${{ env.CONDA_AUTO_UPDATE_CONDA }}
Expand Down Expand Up @@ -207,15 +207,15 @@ jobs:
fail-fast: false
matrix:
os: ${{fromJson(needs.set-os.outputs.matrix_os)}}
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12', '3.13']
env:
PYTHON_VER: ${{ matrix.python-version }}

steps:
- uses: actions/checkout@v6

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
uses: conda-incubator/setup-miniconda@v4
with:
miniconda-version: ${{ env.CONDA_MINICONDA_VERSION }}
auto-update-conda: ${{ env.CONDA_AUTO_UPDATE_CONDA }}
Expand All @@ -237,7 +237,7 @@ jobs:
pip install -e ".[all,dev]" --no-deps

- name: Download data from artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: data
path: ~/.cache/mhkit
Expand Down Expand Up @@ -265,7 +265,7 @@ jobs:
fail-fast: false
matrix:
os: ${{fromJson(needs.set-os.outputs.matrix_os)}}
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12', '3.13']

steps:
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -286,7 +286,7 @@ jobs:
uses: actions/checkout@v6

- name: Download data from artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: data
path: ~/.cache/mhkit
Expand Down Expand Up @@ -335,13 +335,13 @@ jobs:
fail-fast: false
matrix:
os: ${{fromJson(needs.set-os.outputs.matrix_os)}}
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12', '3.13']

steps:
- uses: actions/checkout@v6

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
uses: conda-incubator/setup-miniconda@v4
with:
miniconda-version: ${{ env.CONDA_MINICONDA_VERSION }}
auto-update-conda: ${{ env.CONDA_AUTO_UPDATE_CONDA }}
Expand All @@ -363,13 +363,13 @@ jobs:
pip install -e ".[all,dev]" --no-deps

- name: Download Wave Hindcast data from artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: wave-hindcast-data
path: ~/.cache/mhkit/wave-hindcast

- name: Download Wind Hindcast data from artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: wind-hindcast-data
path: ~/.cache/mhkit/wind-hindcast
Expand Down Expand Up @@ -460,7 +460,7 @@ jobs:
matrix:
module:
[wave, tidal, river, dolfyn, power, loads, mooring, acoustics, utils]
python-version: ['3.12']
python-version: ['3.13']

steps:
- uses: actions/checkout@v6
Expand All @@ -471,7 +471,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Download non-hindcast data
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: data
path: ~/.cache/mhkit
Expand Down Expand Up @@ -560,7 +560,7 @@ jobs:
uses: actions/checkout@v6

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
uses: conda-incubator/setup-miniconda@v4
with:
miniconda-version: ${{ env.CONDA_MINICONDA_VERSION }}
auto-update-conda: ${{ env.CONDA_AUTO_UPDATE_CONDA }}
Expand All @@ -582,21 +582,21 @@ jobs:
pip install -e ".[all,dev]" --no-deps

- name: Download non-hindcast data
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: data
path: ~/.cache/mhkit

- name: Download Wave Hindcast data (if available)
if: (needs.check-changes.outputs.should-run-hindcast == 'true')
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: wave-hindcast-data
path: ~/.cache/mhkit/wave-hindcast

- name: Download Wind Hindcast data (if available)
if: (needs.check-changes.outputs.should-run-hindcast == 'true')
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: wind-hindcast-data
path: ~/.cache/mhkit/wind-hindcast
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-wheel-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12', '3.13']

steps:
- uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ See the [MHKiT documentation](https://mhkit-software.github.io/MHKiT) for more i

## Installation

[MHKiT-Python](https://github.com/MHKiT-Software/MHKiT-Python) requires [Python (3.10-3.12)](https://www.python.org/).
[MHKiT-Python](https://github.com/MHKiT-Software/MHKiT-Python) requires [Python (3.10-3.13)](https://www.python.org/).

See [installation instructions](https://mhkit-software.github.io/MHKiT/installation.html) for more information.

Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python>=3.10,<3.13
- python>=3.10,<3.14
- pip
- numpy>=2.0.0
- pandas>=2.2.2
Expand Down