Merge branch 'master' into 325-find-test-nbs-with-wildcards

Author: willfurnass

tox.ini

@@ -21,15 +21,15 @@ commands =
 
     ; Ensure the user manual Notebook runs *without errors* (do not check for regressions yet)
     ; (add --nbdime if running tox locally and want to visualise/explore diffs in web browser)
-    pytest --verbose --maxfail=1 --nbval-lax docs/MuMoTuserManual.ipynb
+    pytest --verbose --maxfail=1 --nbval-lax --nbval-cell-timeout=120 docs/MuMoTuserManual.ipynb
 
     ; Ensure test and demo Notebooks runs *without errors* (do not check for regressions yet)
     ; (add --nbdime if running tox locally and want to visualise/explore diffs in web browser)
-    pytest --verbose --maxfail=1 --nbval-lax --cov-config=tox.ini --cov="{envsitepackagesdir}/mumot" --cov-append $(find TestNotebooks DemoNotebooks -type f -name '*.ipynb')
+    pytest --verbose --maxfail=1 --nbval-lax --nbval-cell-timeout=120 --cov-config=tox.ini --cov="{envsitepackagesdir}/mumot" --cov-append $(find TestNotebooks DemoNotebooks -type f -name '*.ipynb')
 
     ; Ensure the user manual and regression test Notebooks do not show regressions (TODO; leave commented)
     ; (add --nbdime if running tox locally and want to visualise/explore diffs in web browser)
-    ; pytest --verbose --maxfail=1 --nbval --cov-config=tox.ini --cov="{envsitepackagesdir}/mumot" --cov-append TestNotebooks/MuMoTtest.ipynb
+    ; pytest --verbose --maxfail=1 --nbval --nbval-cell-timeout=120 --cov-config=tox.ini --cov="{envsitepackagesdir}/mumot" --cov-append TestNotebooks/MuMoTtest.ipynb
 
     ; Check user manual does not contain output cells
     bash -c 'test $(nbshow --outputs docs/MuMoTuserManual.ipynb | wc -c) -eq 0'