diff --git a/pyproject.toml.rej b/pyproject.toml.rej deleted file mode 100644 index 90b4ebc1..00000000 --- a/pyproject.toml.rej +++ /dev/null @@ -1,10 +0,0 @@ -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]`