From e6766d0fe56fc9c5e3e88ecf3ace78a8e3be925a Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 31 May 2023 10:46:08 +0100 Subject: [PATCH 1/4] Remove old test image --- .../tests/baseline/test_slice.png | Bin 7540 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/napari_matplotlib/tests/baseline/test_slice.png diff --git a/src/napari_matplotlib/tests/baseline/test_slice.png b/src/napari_matplotlib/tests/baseline/test_slice.png deleted file mode 100644 index 4b974fa431df00e4cbdef7a8163e54e05481f03f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7540 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 Date: Wed, 31 May 2023 10:49:32 +0100 Subject: [PATCH 2/4] Move pytest config to pyproject.toml --- pyproject.toml | 10 +++++++++- pytest.ini | 8 -------- 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 pytest.ini diff --git a/pyproject.toml b/pyproject.toml index 1944249c..1abda539 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,10 +2,18 @@ requires = ["setuptools", "wheel", "setuptools_scm"] build-backend = "setuptools.build_meta" - [tool.setuptools_scm] write_to = "src/napari_matplotlib/_version.py" +[tool.pytest.ini_options] +qt_api = "pyqt6" +filterwarnings = [ + "error", + # Coming from vispy + "ignore:distutils Version classes are deprecated:DeprecationWarning", + "ignore:`np.bool8` is a deprecated alias for `np.bool_`:DeprecationWarning", +] + [tool.black] line-length = 79 diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 548e5f53..00000000 --- a/pytest.ini +++ /dev/null @@ -1,8 +0,0 @@ -[pytest] -qt_api = pyqt6 -filterwarnings = - error - - # Coming from vispy - ignore:distutils Version classes are deprecated:DeprecationWarning - ignore:`np.bool8` is a deprecated alias for `np.bool_`:DeprecationWarning From 9a041aef22dcb8e5c473f986fb4ac6974fecbf85 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 31 May 2023 10:51:23 +0100 Subject: [PATCH 3/4] Run figure tests by default --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 1abda539..7c7dbbdd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,7 @@ write_to = "src/napari_matplotlib/_version.py" [tool.pytest.ini_options] qt_api = "pyqt6" +addopts = "--mpl" filterwarnings = [ "error", # Coming from vispy From e6855f9818d36b770629bdf07f7cb9be4e684f80 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 31 May 2023 10:51:35 +0100 Subject: [PATCH 4/4] gitignore figure test generated by tox --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 05216979..90b59392 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,6 @@ venv/ # written by setuptools_scm **/_version.py + +# Generated by test runs +reports