Merge branch 'notebooks' of github.com:ufs-community/uwtools into not…

…ebooks
ufs-community · Nov 19, 2024 · c382d43 · c382d43
2 parents a8f250c + e7a3bff
commit c382d43
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/.github/scripts/test-nb.sh b/.github/scripts/test-nb.sh
diff --git a/.github/scripts/test.sh b/.github/scripts/test.sh
@@ -8,11 +8,12 @@ run_tests() {
   devpkgs=$(jq .packages.dev[] recipe/meta.json | tr -d ' "')
   conda create --yes --name $env --quiet python=$PYTHON_VERSION $devpkgs
   conda activate $env
+  . notebooks/install-deps
   set -x
   python --version
   git clean -dfx
   pip install --editable src # sets new Python version in entry-point scripts
-  make test
+  make test && make test-nb
   status=$?
   set +x
   conda deactivate

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -23,5 +23,3 @@ jobs:
         run: .github/scripts/format-check.sh
       - name: Test
         run: .github/scripts/test.sh
-      - name: Test Notebooks
-        run: .github/scripts/test-nb.sh
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 *.egg-info
 *.swp
 .coverage
-__pycache__
+__pycache__
diff --git a/notebooks/.gitignore b/notebooks/.gitignore
@@ -1,2 +1,2 @@
 .ipynb_checkpoints
-tmp
+tmp
diff --git a/notebooks/install-deps b/notebooks/install-deps
@@ -1 +1 @@
-conda install -q -y jupyterlab pytest testbook
+conda install -q -y --repodata-fn repodata.json "jupyterlab<4.4" "testbook<0.5"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		conda install -q -y jupyterlab pytest testbook
		conda install -q -y --repodata-fn repodata.json "jupyterlab<4.4" "testbook<0.5"