Skip to content
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2ccc286
Merge pull request #267 from MHKiT-Software/develop
ssolson Aug 31, 2023
ae6b715
assert to exception
ssolson Nov 21, 2023
7614867
Revert "Ensure interpolation values are within range when sampling co…
ssolson Nov 21, 2023
d09e606
Merge branch 'master' of https://github.com/MHKiT-Software/MHKiT-Pyth…
ssolson Nov 29, 2023
35a917c
Merge branch 'develop' of https://github.com/ssolson/MHKiT-Python int…
ssolson Nov 29, 2023
afd3171
Merge branch 'develop' of https://github.com/MHKiT-Software/MHKiT-Pyt…
ssolson Dec 6, 2023
667a416
Merge branch 'develop' of https://github.com/ssolson/MHKiT-Python int…
ssolson Dec 6, 2023
76cf500
Merge branch 'develop' of https://github.com/MHKiT-Software/MHKiT-Pyt…
ssolson Feb 5, 2024
e267aa0
Merge branch 'develop' of https://github.com/MHKiT-Software/MHKiT-Pyt…
ssolson Mar 12, 2024
05916f5
Merge branch 'develop' of https://github.com/ssolson/MHKiT-Python int…
ssolson Mar 12, 2024
d906411
Merge branch 'develop' of https://github.com/MHKiT-Software/MHKiT-Pyt…
ssolson Mar 19, 2024
915d99d
Merge branch 'develop' of https://github.com/MHKiT-Software/MHKiT-Pyt…
ssolson Apr 23, 2024
ecbc2fc
Merge branch 'develop' of https://github.com/MHKiT-Software/MHKiT-Pyt…
ssolson Apr 25, 2024
a3ed6e2
Merge branch 'develop' of https://github.com/MHKiT-Software/MHKiT-Pyt…
ssolson Apr 29, 2024
9597e9b
use conda-incubator/setup-miniconda
ssolson Apr 29, 2024
908dcc7
remove environment-file arg
ssolson Apr 29, 2024
ecab2c3
replace remaining `s-weigand/setup-conda@v1`
ssolson Apr 29, 2024
bd4f299
python-version: ${{ env.PYTHON_VER }}
ssolson Apr 29, 2024
0623dd9
source activate TEST
ssolson Apr 30, 2024
cbbfb4e
more source activate TEST
ssolson Apr 30, 2024
79d2cf2
conda create
ssolson Apr 30, 2024
ea3065a
export PATH
ssolson Apr 30, 2024
4a99b64
conda activate test
ssolson Apr 30, 2024
7a5f9ae
back to default conda env
ssolson Apr 30, 2024
249f24a
shell: bash -l {0}
ssolson Apr 30, 2024
401aa95
conda-incubator/setup-miniconda v2 -> v3
ssolson Apr 30, 2024
e4012a8
shell: bash -l {0}
ssolson Apr 30, 2024
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
105 changes: 52 additions & 53 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,30 +57,30 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Conda
uses: s-weigand/setup-conda@v1
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
activate-conda: false
conda-channels: conda-forge
miniconda-version: 'latest'
auto-update-conda: true
python-version: ${{ env.PYTHON_VER }}
activate-environment: TESTconda
use-only-tar-bz2: true

- name: Python setup
- name: Setup Conda environment
shell: bash -l {0}
run: |
conda create --name TEST python=${{ env.PYTHON_VER }} numpy cython pip hdf5 libnetcdf cftime netcdf4 --strict-channel-priority
source activate TEST
export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH"
pip install -e . --no-deps --force-reinstall
conda install numpy cython pip hdf5 libnetcdf cftime netcdf4 --strict-channel-priority
pip install -e . --force-reinstall

- name: Install dependencies
shell: bash -l {0}
run: |
source activate TEST
python -m pip install --upgrade pip wheel
pip install coverage pytest coveralls .

- name: Prepare non-hindcast API data
shell: bash -l {0}
run: |
source activate TEST
pytest mhkit/tests/river/test_io_usgs.py
pytest mhkit/tests/tidal/test_io.py
pytest mhkit/tests/wave/io/test_cdip.py
Expand All @@ -101,30 +101,30 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Conda
uses: s-weigand/setup-conda@v1
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
activate-conda: false
conda-channels: conda-forge
miniconda-version: 'latest'
auto-update-conda: true
activate-environment: TEST
python-version: ${{ matrix.python-version }}
use-only-tar-bz2: true

- name: Python setup
- name: Setup Conda environment
shell: bash -l {0}
run: |
conda create --name TEST python=${{ env.PYTHON_VER }} numpy cython pip hdf5 libnetcdf cftime netcdf4 --strict-channel-priority
source activate TEST
export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH"
conda install numpy cython pip pytest hdf5 libnetcdf cftime netcdf4 coverage --strict-channel-priority
pip install -e . --no-deps --force-reinstall

- name: Install dependencies
shell: bash -l {0}
run: |
source activate TEST
python -m pip install --upgrade pip wheel
pip install coverage pytest coveralls .

- name: Prepare Wave Hindcast data
shell: bash -l {0}
run: |
source activate TEST
pytest mhkit/tests/wave/io/hindcast/test_hindcast.py

- name: Upload Wave Hindcast data as artifact
Expand All @@ -143,30 +143,30 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Conda
uses: s-weigand/setup-conda@v1
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
activate-conda: false
conda-channels: conda-forge
miniconda-version: 'latest'
auto-update-conda: true
activate-environment: TEST
python-version: ${{ matrix.python-version }}
use-only-tar-bz2: true

- name: Python setup
- name: Setup Conda environment
shell: bash -l {0}
run: |
conda create --name TEST python=${{ env.PYTHON_VER }} numpy cython pip hdf5 libnetcdf cftime netcdf4 --strict-channel-priority
source activate TEST
export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH"
conda install numpy cython pip pytest hdf5 libnetcdf cftime netcdf4 coverage --strict-channel-priority
pip install -e . --no-deps --force-reinstall

- name: Install dependencies
shell: bash -l {0}
run: |
source activate TEST
python -m pip install --upgrade pip wheel
pip install coverage pytest coveralls .

- name: Prepare Wind Hindcast data
shell: bash -l {0}
run: |
source activate TEST
pytest mhkit/tests/wave/io/hindcast/test_wind_toolkit.py

- name: Upload Wind Hindcast data as artifact
Expand All @@ -190,24 +190,24 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Setup Conda
uses: s-weigand/setup-conda@v1
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
activate-conda: false
conda-channels: conda-forge
miniconda-version: 'latest'
auto-update-conda: true
activate-environment: TEST
python-version: ${{ matrix.python-version }}
use-only-tar-bz2: true

- name: Python ${{ matrix.python-version }}
- name: Create and setup Conda environment
shell: bash -l {0}
run: |
conda create --name TEST python=${PYTHON_VER} numpy cython pip hdf5 libnetcdf cftime netcdf4 --strict-channel-priority
source activate TEST
export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH" # so setup.py finds nc-config
conda install numpy cython pip hdf5 libnetcdf cftime netcdf4 --strict-channel-priority
pip install -e . --no-deps --force-reinstall

- name: Install dependencies
shell: bash -l {0}
run: |
source activate TEST
python -m pip install --upgrade pip wheel
pip install coverage pytest coveralls .

Expand All @@ -220,13 +220,11 @@ jobs:
- name: Run pytest
shell: bash -l {0}
run: |
source activate TEST
coverage run --rcfile=.github/workflows/.coveragerc --source=./mhkit/ -m pytest -c .github/workflows/pytest.ini

- name: Upload coverage data to coveralls.io
shell: bash -l {0}
run: |
source activate TEST
coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -261,11 +259,13 @@ jobs:
path: ~/.cache/mhkit

- name: Update and install packages
shell: bash -l {0}
run: |
python -m pip install --upgrade pip wheel
pip install coverage pytest coveralls .

- name: Run pytest
shell: bash -l {0}
run: |
coverage run --rcfile=.github/workflows/.coveragerc --source=./mhkit/ -m pytest -c .github/workflows/pytest.ini

Expand Down Expand Up @@ -298,18 +298,19 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Setup Conda
uses: s-weigand/setup-conda@v1
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
activate-conda: false
conda-channels: conda-forge
miniconda-version: 'latest'
auto-update-conda: true
activate-environment: TEST
python-version: ${{ matrix.python-version }}
use-only-tar-bz2: true

- name: Python ${{ matrix.python-version }}
- name: Setup Conda environment
shell: bash -l {0}
run: |
conda create --name TEST python=${{ matrix.python-version }} numpy cython pip pytest hdf5 libnetcdf cftime netcdf4 coverage --strict-channel-priority
source activate TEST
export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH" # so setup.py finds nc-config
conda install numpy cython pip pytest hdf5 libnetcdf cftime netcdf4 coverage --strict-channel-priority
pip install -e . --no-deps --force-reinstall

- name: Download Wave Hindcast data from artifact
Expand All @@ -334,15 +335,13 @@ jobs:
- name: Install MHKiT and run pytest
shell: bash -l {0}
run: |
source activate TEST
python -m pip install --upgrade pip wheel
pip install coveralls .
coverage run --rcfile=.github/workflows/.coveragehindcastrc -m pytest -c .github/workflows/pytest-hindcast.ini
coverage run --rcfile=.github/workflows/.coveragehindcastrc -m pytest -c .github/workflows/pytest-hindcast.ini

- name: Upload coverage data to coveralls.io
shell: bash -l {0}
run: |
source activate TEST
coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down