Merge pull request #338 from gwmod/311-test-run-on-push-confusing

remove confusing ci step
gwmod · Apr 19, 2024 · bef2118 · bef2118
2 parents 64605fa + 69ccac7
commit bef2118
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,16 +44,7 @@ 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' }}
         env:
             NHI_GWO_USERNAME: ${{ secrets.NHI_GWO_USERNAME}}
             NHI_GWO_PASSWORD: ${{ secrets.NHI_GWO_PASSWORD}}

diff --git a/nlmod/dims/grid.py b/nlmod/dims/grid.py
@@ -237,6 +237,13 @@ 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."""
+
+    warnings.warn(
+        "'modelgrid_to_vertex_ds' is deprecated and will be removed in a"
+        "future version, please use 'modelgrid_to_ds' instead",
+        DeprecationWarning,
+    )
+
     # add modelgrid to ds
     ds["xv"] = ("iv", mg.verts[:, 0])
     ds["yv"] = ("iv", mg.verts[:, 1])