Skip to content

Commit

Permalink
Merge pull request #171 from csdms/mcflugen/update-ci
Browse files Browse the repository at this point in the history
Update continuous integration
  • Loading branch information
mcflugen authored Oct 3, 2024
2 parents da1f83d + 2686d10 commit 485211b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/test-notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.9]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
Expand All @@ -39,7 +39,6 @@ jobs:
- name: Install requirements
run: |
mamba install --file=requirements.txt
mamba install gimli.units
mamba list
- name: Build and install package
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.8, 3.9]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
Expand All @@ -39,7 +39,6 @@ jobs:
- name: Install requirements
run: |
mamba install --file=requirements.txt --file=requirements-testing.txt
mamba install gimli.units
mamba list
- name: Install Windows requirements
Expand All @@ -66,5 +65,5 @@ jobs:
pytest --cov=pymt --cov-report=xml:$(pwd)/coverage.xml -vvv
- name: Coveralls
if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9'
if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10'
uses: AndreMiras/coveralls-python-action@v20201129
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
click
deprecated
gimli.units>=0.3.2
jinja2
landlab>=2
matplotlib
model_metadata>=0.7
netcdf4
numpy<1.24 # for Ku
pyyaml
scipy<1.9 # see #162
shapely<2 # see #164
Expand Down

0 comments on commit 485211b

Please sign in to comment.