From a50c9d5c87cce56fb604084f41d97fe63a37ebe3 Mon Sep 17 00:00:00 2001 From: ruaridhg Date: Mon, 15 May 2023 11:29:51 +0100 Subject: [PATCH 1/7] Gitignore report from tox and baseline images --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 708dea14..c1dffcd4 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,8 @@ pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ .tox/ +report/ +src/napari_matplotlib/tests/baseline/ .coverage .coverage.* .cache From 5dc478bf2307ab633ae2cc54db1d12602eb1dd0b Mon Sep 17 00:00:00 2001 From: ruaridhg Date: Mon, 15 May 2023 14:06:32 +0100 Subject: [PATCH 2/7] in base.py changed backend from qt5agg to qtagg --- src/napari_matplotlib/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/napari_matplotlib/base.py b/src/napari_matplotlib/base.py index 264de4d2..a9528a48 100644 --- a/src/napari_matplotlib/base.py +++ b/src/napari_matplotlib/base.py @@ -4,7 +4,7 @@ import napari from matplotlib.axes import Axes -from matplotlib.backends.backend_qt5agg import ( +from matplotlib.backends.backend_qtagg import ( FigureCanvas, NavigationToolbar2QT, ) From 8727128c911b2d870a6db0ab6dfdf8d761a8ff09 Mon Sep 17 00:00:00 2001 From: ruaridhg Date: Mon, 15 May 2023 15:07:23 +0100 Subject: [PATCH 3/7] Added 3D brain image via pooch to conftest and tested in test_slice --- src/napari_matplotlib/tests/conftest.py | 5 +++++ src/napari_matplotlib/tests/test_slice.py | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/napari_matplotlib/tests/conftest.py b/src/napari_matplotlib/tests/conftest.py index f40e5120..06ed51f6 100644 --- a/src/napari_matplotlib/tests/conftest.py +++ b/src/napari_matplotlib/tests/conftest.py @@ -17,3 +17,8 @@ def image_data(request): @pytest.fixture def astronaut_data(): return data.astronaut(), {"rgb": True} + + +@pytest.fixture +def brain_data(): + return data.brain(), {"rgb": False} diff --git a/src/napari_matplotlib/tests/test_slice.py b/src/napari_matplotlib/tests/test_slice.py index d0be3cc1..4662f74f 100644 --- a/src/napari_matplotlib/tests/test_slice.py +++ b/src/napari_matplotlib/tests/test_slice.py @@ -1,10 +1,14 @@ -import numpy as np +import pytest from napari_matplotlib import SliceWidget -def test_scatter(make_napari_viewer): - # Smoke test adding a histogram widget +@pytest.mark.mpl_image_compare +def test_slice(make_napari_viewer, brain_data): + # Smoke test adding a slice widget viewer = make_napari_viewer() - viewer.add_image(np.random.random((100, 100, 100))) - SliceWidget(viewer) + viewer.add_image( + brain_data[0], **brain_data[1] + ) # (np.random.random((100, 100, 100))) + fig = SliceWidget(viewer).figure + return fig From bf815637be7b4fb4cba7c9f3466b0b12cebb88dd Mon Sep 17 00:00:00 2001 From: ruaridhg Date: Mon, 15 May 2023 16:43:57 +0100 Subject: [PATCH 4/7] Added baseline test_slice image, removed comments and reverted gitignore for baseline folder --- .gitignore | 1 - .../tests/baseline/test_slice.png | Bin 0 -> 7540 bytes src/napari_matplotlib/tests/test_slice.py | 5 +---- 3 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 src/napari_matplotlib/tests/baseline/test_slice.png diff --git a/.gitignore b/.gitignore index c1dffcd4..05216979 100644 --- a/.gitignore +++ b/.gitignore @@ -38,7 +38,6 @@ pip-delete-this-directory.txt htmlcov/ .tox/ report/ -src/napari_matplotlib/tests/baseline/ .coverage .coverage.* .cache diff --git a/src/napari_matplotlib/tests/baseline/test_slice.png b/src/napari_matplotlib/tests/baseline/test_slice.png new file mode 100644 index 0000000000000000000000000000000000000000..4b974fa431df00e4cbdef7a8163e54e05481f03f GIT binary patch literal 7540 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 Date: Tue, 16 May 2023 16:24:10 +0100 Subject: [PATCH 5/7] Added pooch to testing dependencies and added commands to tox to make test_slice image available --- setup.cfg | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index dc7d0a03..aa4769a3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -55,6 +55,7 @@ docs = sphinx-gallery testing = napari[pyqt6-experimental] + pooch pyqt6 pytest pytest-cov diff --git a/tox.ini b/tox.ini index d8d4798a..ef2af174 100644 --- a/tox.ini +++ b/tox.ini @@ -11,4 +11,11 @@ python = [testenv] extras = testing -commands = python -m pytest --mpl -v --color=yes --cov=napari_matplotlib --cov-report=xml +allowlist_externals = + mkdir + cp +commands = + - mkdir {envdir}/baseline + - cp -R {toxinidir}/src/napari_matplotlib/tests/baseline {envdir}/baseline + - python -c 'from skimage.data import download_all; download_all()' + - python -m pytest --mpl -v --color=yes --cov=napari_matplotlib --cov-report=xml From 58ccb29f9806bada07282a01d4444b353654ffd8 Mon Sep 17 00:00:00 2001 From: ruaridhg Date: Tue, 16 May 2023 16:31:06 +0100 Subject: [PATCH 6/7] removed redundant tox commands --- tox.ini | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tox.ini b/tox.ini index ef2af174..acf22f6d 100644 --- a/tox.ini +++ b/tox.ini @@ -11,11 +11,6 @@ python = [testenv] extras = testing -allowlist_externals = - mkdir - cp commands = - - mkdir {envdir}/baseline - - cp -R {toxinidir}/src/napari_matplotlib/tests/baseline {envdir}/baseline - python -c 'from skimage.data import download_all; download_all()' - python -m pytest --mpl -v --color=yes --cov=napari_matplotlib --cov-report=xml From 4c47f401c037293ebe0b527113cd0a52218a9e0d Mon Sep 17 00:00:00 2001 From: ruaridhg Date: Tue, 16 May 2023 16:42:17 +0100 Subject: [PATCH 7/7] Import brain data without having to download all skimage datasets --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index acf22f6d..5a8cf188 100644 --- a/tox.ini +++ b/tox.ini @@ -12,5 +12,5 @@ python = [testenv] extras = testing commands = - - python -c 'from skimage.data import download_all; download_all()' + - python -c 'from skimage import data; data.brain()' - python -m pytest --mpl -v --color=yes --cov=napari_matplotlib --cov-report=xml pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy