Skip to content

remove confusing ci step #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OnnoEbbens merged 4 commits into from
Apr 19, 2024
Merged

remove confusing ci step #338

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e581a42
remove confusing ci step
OnnoEbbens Apr 19, 2024
993e02f
add deprecation warning #254
OnnoEbbens Apr 19, 2024
367c1a9
typo
OnnoEbbens Apr 19, 2024
69ccac7
fixes for comments Bas
OnnoEbbens Apr 19, 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
10 changes: 1 addition & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,8 @@ jobs:
run: |
python -c "import nlmod; nlmod.util.download_mfbinaries()"

- name: Run notebooks
if: ${{ github.event_name == 'push' }}
env:
NHI_GWO_USERNAME: ${{ secrets.NHI_GWO_USERNAME}}
NHI_GWO_PASSWORD: ${{ secrets.NHI_GWO_PASSWORD}}
run: |
py.test ./tests -m "not notebooks"

- name: Run tests only
if: ${{ github.event_name == 'pull_request' }}
if: ${{ github.event_name == 'pull_request' || github.event_name == 'push'}}
env:
NHI_GWO_USERNAME: ${{ secrets.NHI_GWO_USERNAME}}
NHI_GWO_PASSWORD: ${{ secrets.NHI_GWO_PASSWORD}}
Expand Down
6 changes: 6 additions & 0 deletions nlmod/dims/grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,12 @@ def modelgrid_from_ds(ds, rotated=True, nlay=None, top=None, botm=None, **kwargs

def modelgrid_to_vertex_ds(mg, ds, nodata=-1):
"""Add information about the calculation-grid to a model dataset."""

logger.warning(
"'modelgrid_to_vertex_ds' is deprecated and will be removed in a"
"future version, please use 'modelgrid_to_ds' instead"
)

# add modelgrid to ds
ds["xv"] = ("iv", mg.verts[:, 0])
ds["yv"] = ("iv", mg.verts[:, 1])
Expand Down