diff --git a/.gitignore b/.gitignore index 708dea14..05216979 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ .tox/ +report/ .coverage .coverage.* .cache 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/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, ) 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 00000000..4b974fa4 Binary files /dev/null and b/src/napari_matplotlib/tests/baseline/test_slice.png differ 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..d439d90d 100644 --- a/src/napari_matplotlib/tests/test_slice.py +++ b/src/napari_matplotlib/tests/test_slice.py @@ -1,10 +1,11 @@ -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): viewer = make_napari_viewer() - viewer.add_image(np.random.random((100, 100, 100))) - SliceWidget(viewer) + viewer.add_image(brain_data[0], **brain_data[1]) + fig = SliceWidget(viewer).figure + return fig diff --git a/tox.ini b/tox.ini index d8d4798a..5a8cf188 100644 --- a/tox.ini +++ b/tox.ini @@ -11,4 +11,6 @@ python = [testenv] extras = testing -commands = python -m pytest --mpl -v --color=yes --cov=napari_matplotlib --cov-report=xml +commands = + - python -c 'from skimage import data; data.brain()' + - python -m pytest --mpl -v --color=yes --cov=napari_matplotlib --cov-report=xml