Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates due to new firedrake install process #291

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/test_suite.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: 'Run Goalie test suite'

on:
# Run test suite whenever main is updated
# Run test suite whenever main and develop branches are updated
push:
branches:
- main
- develop
paths:
- '**.py'
- '**.msh'
Expand All @@ -27,4 +28,4 @@ on:

jobs:
test_suite:
uses: mesh-adaptation/docs/.github/workflows/reusable_test_suite.yml@main
uses: mesh-adaptation/docs/.github/workflows/reusable_test_suite.yml@112_pip_install
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@ test: lint
@cd test/adjoint && make
@echo "PASS"

# `mpiexec -n N ... parallel[N]` only runs tests with @pytest.mark.parallel(nprocs=N)
coverage:
@echo "Generating coverage report..."
@python3 -m coverage erase
@python3 -m coverage run --source=goalie -m pytest -v test
@python3 -m coverage run --parallel-mode --source=goalie -m pytest -v -k "not parallel" test
@mpiexec -n 2 python3 -m coverage run --parallel-mode --source=goalie -m pytest -v -m parallel[2] test
@python3 -m coverage combine
@python3 -m coverage report -m
@python3 -m coverage html

demo:
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ classifiers = [
"Development Status :: 4 - Beta",
"Programming Language :: Python",
]
dependencies = [
"vtk",
]

[project.optional-dependencies]
dev = [
Expand Down
3 changes: 2 additions & 1 deletion test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ all: run

run:
@echo "Running all non-adjoint tests..."
@python3 -m pytest -v -n auto --durations=20 test_*.py
@python3 -m pytest -v -n auto --durations=20 -k "not test_parallel.py" test_*.py
@mpiexec -n 2 python3 -m pytest -v test_parallel.py
@echo "Done."

clean:
Expand Down