Merge pull request #190 from dstansby/unpin-napari

Make compatible with napari 0.4.18
matplotlib · Jul 26, 2023 · 6d9310c · 6d9310c
2 parents 8dbfdba + 9159449
commit 6d9310c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -6,6 +6,7 @@ Bug fixes
 ~~~~~~~~~
 - A full dataset is no longer read into memory when using ``HistogramWidget``.
   Only the current slice is loaded.
+- Fixed compatibility with napari 0.4.18.
 
 Changes
 ~~~~~~~

diff --git a/setup.cfg b/setup.cfg
@@ -28,7 +28,7 @@ project_urls =
 packages = find:
 install_requires =
     matplotlib
-    napari<0.4.18
+    napari
     numpy
     tinycss2
 python_requires = >=3.8
@@ -47,15 +47,15 @@ napari.manifest =
 
 [options.extras_require]
 docs =
-    napari[all]
+    napari[all]==0.4.17
     numpydoc
     pydata-sphinx-theme
     qtgallery
     sphinx
     sphinx-automodapi
     sphinx-gallery
 testing =
-    napari[pyqt6-experimental]
+    napari[pyqt6-experimental]>=0.4.18
     pooch
     pyqt6
     pytest

diff --git a/src/napari_matplotlib/tests/baseline/test_custom_theme.png b/src/napari_matplotlib/tests/baseline/test_custom_theme.png
diff --git a/src/napari_matplotlib/tests/baseline/test_slice_2D.png b/src/napari_matplotlib/tests/baseline/test_slice_2D.png
diff --git a/src/napari_matplotlib/tests/scatter/baseline/test_scatter_2D.png b/src/napari_matplotlib/tests/scatter/baseline/test_scatter_2D.png
diff --git a/src/napari_matplotlib/tests/test_theme.py b/src/napari_matplotlib/tests/test_theme.py
@@ -37,9 +37,11 @@ def _mock_up_theme() -> None:
     https://napari.org/stable/gallery/new_theme.html
     """
     blue_theme = napari.utils.theme.get_theme("dark", False)
-    blue_theme.name = "blue"
+    blue_theme.label = "blue"
     blue_theme.background = "#4169e1"  # my favourite shade of blue
-    napari.utils.theme.register_theme("blue", blue_theme)
+    napari.utils.theme.register_theme(
+        "blue", blue_theme, source="napari-mpl-tests"
+    )
 
 
 def test_theme_background_check(make_napari_viewer):