diff --git a/.cruft.json b/.cruft.json index f0ee6048..c77be0c6 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/arup-group/cookiecutter-pypackage.git", - "commit": "b7724521f898ab28f541d492aff8e2be2ed76a01", + "commit": "b4e39b80b4d9b4d6682ab18635a98a097b292a46", "checkout": null, "context": { "cookiecutter": { diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 40422ee5..91ee369f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,9 +3,16 @@ name: Build docs on: push: branches: - - "**" + - main + + pull_request: + branches: + - main paths-ignore: - tests/** + - ".github/**/*" + - "!.github/workflows/docs.yml" + jobs: docs-test: diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 82498968..8d578c40 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -11,6 +11,8 @@ on: - CONTRIBUTING.md - docs/** - mkdocs.yml + - ".github/**/*" + - "!.github/workflows/pr-ci.yml" jobs: test: diff --git a/pyproject.toml.rej b/pyproject.toml.rej new file mode 100644 index 00000000..90b4ebc1 --- /dev/null +++ b/pyproject.toml.rej @@ -0,0 +1,10 @@ +diff a/pyproject.toml b/pyproject.toml (rejected hunks) +@@ -9,7 +9,7 @@ minversion = "6.0" + # `--cov --cov-report=xml --cov-config=pyproject.toml` - generate coverage report for tests (uses pytest-cov; call `--no-cov` in CLI to switch off; `--cov-config` include to avoid bug) + # `-m 'not high_mem'` - Do not run tests marked as consuming large amounts of memory (call `-m "high_mem"` in CLI to invert this; only `high_mem` marked tests will be run) + # `-p no:memray` - Do not use the memray memory profiling plugin (call `-p memray` in CLI to switch on memory profiling) +-addopts = "-rav --strict-markers -n2 --nbmake --nbmake-kernel=pam --cov --cov-report=xml --cov-config=pyproject.toml -m 'not high_mem' -p no:memray" ++addopts = "-rav --strict-markers -nauto --nbmake --nbmake-kernel=pam --cov --cov-report=xml --cov-config=pyproject.toml -m 'not high_mem' -p no:memray" + testpaths = ["tests", "examples"] + + # to mark a test, decorate it with `@pytest.mark.[marker-name]` diff --git a/requirements/dev.txt b/requirements/dev.txt index 57383799..0d463b0f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,10 +1,10 @@ cruft >= 2, < 3 jupyter < 2 mike >= 2, < 3 -mkdocs < 1.6 +mkdocs >= 1.6, < 2 mkdocs-material >= 9.4, < 10 mkdocs-click < 0.7 -mkdocs-jupyter < 0.24.7 +mkdocs-jupyter >= 0.24.8, < 0.25 mkdocstrings-python < 2 nbmake >= 1.5.1, < 2 pre-commit < 4