From 5eb36df4f094c257656b3f941fe8b094a1bbfc46 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Mon, 8 Mar 2021 23:34:11 +0000 Subject: [PATCH] tests: notebook: fix paths - related https://github.com/computationalmodelling/nbval/issues/116#issuecomment-793148404 --- Makefile | 6 +++--- tests/tests_notebook.ipynb => tests_notebook.ipynb | 0 tox.ini | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) rename tests/tests_notebook.ipynb => tests_notebook.ipynb (100%) diff --git a/Makefile b/Makefile index 8d79aa64..10ee2e2a 100644 --- a/Makefile +++ b/Makefile @@ -61,12 +61,12 @@ testsetup: python setup.py make none testnb: - pytest --nbval --current-env -k ipynb -W=ignore --sanitize-with=setup.cfg --cov=tqdm.notebook --cov-report=term + pytest tests_notebook.ipynb --nbval --current-env -W=ignore --sanitize-with=setup.cfg --cov=tqdm.notebook --cov-report=term testcoverage: @make coverclean - pytest -k ipynb --nbval --current-env --sanitize-with=setup.cfg -W=ignore --cov=tqdm --cov-report=xml --cov-report=term - pytest -k "not perf" --cov-append --cov=tqdm --cov-report=xml --cov-report=term --cov-fail-under=80 + pytest tests_notebook.ipynb --cov=tqdm --cov-report= --nbval --current-env --sanitize-with=setup.cfg -W=ignore + pytest -k "not perf" --cov=tqdm --cov-report=xml --cov-report=term --cov-append --cov-fail-under=80 testperf: # do not use coverage (which is extremely slow) diff --git a/tests/tests_notebook.ipynb b/tests_notebook.ipynb similarity index 100% rename from tests/tests_notebook.ipynb rename to tests_notebook.ipynb diff --git a/tox.ini b/tox.ini index 96e26b6d..badf6458 100644 --- a/tox.ini +++ b/tox.ini @@ -37,15 +37,15 @@ deps= py{36,37,38,39}: rich tf: tensorflow commands= - pytest --cov=tqdm --cov-report=xml --cov-report=term -k ipynb --nbval --current-env -W=ignore --sanitize-with=setup.cfg - pytest --cov=tqdm --cov-report=xml --cov-report=term -k "not perf" --cov-append + pytest --cov=tqdm --cov-report= tests_notebook.ipynb --nbval --current-env -W=ignore --sanitize-with=setup.cfg + pytest --cov=tqdm --cov-report=xml --cov-report=term --cov-append -k "not perf" {[core]commands} allowlist_externals=codacy [testenv:py{27,py2}{,-tf}{,-keras}] commands= - pytest --cov=tqdm --cov-report=xml --cov-report=term -k ipynb -o addopts= -v --tb=short -rxs -W=ignore --durations=10 --nbval --current-env --sanitize-with=setup.cfg - pytest --cov=tqdm --cov-report=xml --cov-report=term -k "not perf" -o addopts= -v --tb=short -rxs -W=error --durations=10 --cov-append + pytest --cov=tqdm --cov-report= tests_notebook.ipynb -o addopts= -v --tb=short -rxs -W=ignore --durations=10 --nbval --current-env --sanitize-with=setup.cfg + pytest --cov=tqdm --cov-report=xml --cov-report=term --cov-append -k "not perf" -o addopts= -v --tb=short -rxs -W=error --durations=10 {[core]commands} # no cython/numpy/pandas