Merge pull request #297 from firedrakeproject/JDBetteridge/various_ci…

…_fixes

Fixed failing notebook tests, updated CI, made tests DRYer

.github/workflows/build.yml

@@ -26,10 +26,6 @@ jobs:
         run: |
           cd ..
           rm -rf build
-      - name: Setup python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
       - name: Install Gusto
         run: |
           . /home/firedrake/firedrake/bin/activate
@@ -38,23 +34,19 @@ jobs:
       - name: Gusto unit-tests
         run: |
           . /home/firedrake/firedrake/bin/activate
-          python $(which firedrake-clean)
-          python -m pytest -n 12 -v unit-tests
+          make unit_test PYTEST_ARGS="-n 12 -v"
       - name: Gusto integration-tests
         run: |
           . /home/firedrake/firedrake/bin/activate
-          python $(which firedrake-clean)
-          python -m pytest -n 12 -v integration-tests
+          make integration_test PYTEST_ARGS="-n 12 -v"
       - name: Gusto examples
         run: |
           . /home/firedrake/firedrake/bin/activate
-          python $(which firedrake-clean)
-          python -m pytest -n 12 -v examples
-      - name: Gusto jupyter_notebooks 
+          make example PYTEST_ARGS="-n 12 -v"
+      - name: Gusto jupyter_notebooks
         run: |
           . /home/firedrake/firedrake/bin/activate
-          python $(which firedrake-clean)
-          python -m pytest --nbval-lax -n 12 -v jupyter_notebooks
+          make notebook_test PYTEST_ARGS="-n 4 -v"
       - name: Lint
         if: ${{ always() }}
         run: |

Makefile

@@ -10,18 +10,24 @@ lint:
 	@echo "    Linting gusto plotting scripts"
 	@python3 -m flake8 plotting
 
-test:
-	@echo "    Running all tests"
-	@python3 -m pytest unit-tests integration-tests examples $(PYTEST_ARGS)
+test: unit_test integration_test example notebook_test
 
-unit_test:
+clean_cache:
+	@echo "    Cleaning caches"
+	@firedrake-clean
+
+unit_test: clean_cache
 	@echo "    Running all unit-tests"
 	@python3 -m pytest unit-tests $(PYTEST_ARGS)
 
-integration_test:
+integration_test: clean_cache
 	@echo "    Running all integration-tests"
 	@python3 -m pytest integration-tests $(PYTEST_ARGS)
 
-example:
+example: clean_cache
 	@echo "    Running all examples"
-	@python3 -m pytest examples $(PYTEST_ARGS)
+	@python3 -m pytest examples $(PYTEST_ARGS)
+
+notebook_test: clean_cache
+	@echo "    Running all Jupyter notebooks"
+	@python3 -m pytest --nbval-lax -n 4 --dist loadscope jupyter_notebooks $(PYTEST_ARGS)