Skip to content

Commit bef2118

Browse files
authored
Merge pull request #338 from gwmod/311-test-run-on-push-confusing
remove confusing ci step
2 parents 64605fa + 69ccac7 commit bef2118

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,7 @@ jobs:
4444
run: |
4545
python -c "import nlmod; nlmod.util.download_mfbinaries()"
4646
47-
- name: Run notebooks
48-
if: ${{ github.event_name == 'push' }}
49-
env:
50-
NHI_GWO_USERNAME: ${{ secrets.NHI_GWO_USERNAME}}
51-
NHI_GWO_PASSWORD: ${{ secrets.NHI_GWO_PASSWORD}}
52-
run: |
53-
py.test ./tests -m "not notebooks"
54-
5547
- name: Run tests only
56-
if: ${{ github.event_name == 'pull_request' }}
5748
env:
5849
NHI_GWO_USERNAME: ${{ secrets.NHI_GWO_USERNAME}}
5950
NHI_GWO_PASSWORD: ${{ secrets.NHI_GWO_PASSWORD}}

nlmod/dims/grid.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,13 @@ def modelgrid_from_ds(ds, rotated=True, nlay=None, top=None, botm=None, **kwargs
237237

238238
def modelgrid_to_vertex_ds(mg, ds, nodata=-1):
239239
"""Add information about the calculation-grid to a model dataset."""
240+
241+
warnings.warn(
242+
"'modelgrid_to_vertex_ds' is deprecated and will be removed in a"
243+
"future version, please use 'modelgrid_to_ds' instead",
244+
DeprecationWarning,
245+
)
246+
240247
# add modelgrid to ds
241248
ds["xv"] = ("iv", mg.verts[:, 0])
242249
ds["yv"] = ("iv", mg.verts[:, 1])

0 commit comments

Comments
 (0)