Merge branch 'main' into fix-default-colorscheme

jo-mueller · web-flow · commit 24b3acc1d0e5 · 2023-05-02T16:57:48.000+02:00
diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
@@ -1,6 +1,3 @@
-# This workflows will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
-
 name: tests
 
 on:
@@ -20,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
     strategy:
       matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-latest, macos-latest, windows-latest]
         python-version: ['3.8', '3.9', '3.10']
 
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,43 +1,43 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
       - id: check-docstring-first
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.20.1
+    rev: v2.2.0
     hooks:
       - id: setup-cfg-fmt
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies: [flake8-typing-imports>=1.9.0]
-  - repo: https://github.com/myint/autoflake
-    rev: v1.4
+  - repo: https://github.com/PyCQA/autoflake
+    rev: v2.1.1
     hooks:
       - id: autoflake
         args: ["--in-place", "--remove-all-unused-imports"]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.3.0
     hooks:
       - id: black
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.0
+    rev: v3.3.2
     hooks:
       - id: pyupgrade
         args: [--py38-plus, --keep-runtime-typing]
   - repo: https://github.com/tlambert03/napari-plugin-checks
-    rev: v0.2.0
+    rev: v0.3.0
     hooks:
       - id: napari-plugin-checks
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910-1
+    rev: v1.2.0
     hooks:
      - id: mypy
        args: ["--disallow-incomplete-defs", "--ignore-missing-imports"]
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,6 @@
+[pytest]
+filterwarnings =
+    error
+
+    # Coming from vispy
+    ignore:distutils Version classes are deprecated:DeprecationWarning
diff --git a/setup.cfg b/setup.cfg
@@ -17,9 +17,6 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
     Topic :: Software Development :: Testing
 project_urls =
     Bug Tracker = https://github.com/matplotlib/napari-matplotlib/issues
diff --git a/src/napari_matplotlib/base.py b/src/napari_matplotlib/base.py
@@ -48,8 +48,10 @@ def __init__(self, napari_viewer: napari.viewer.Viewer):
 
         self.viewer = napari_viewer
         self.canvas = FigureCanvas()
+
         self.canvas.figure.set_tight_layout(True)
         self.canvas.figure.patch.set_facecolor(NAPARI_WINDOW_COLOR)
+        self.canvas.figure.set_layout_engine("constrained")
         self.toolbar = NapariNavigationToolbar(self.canvas, self)
         self._replace_toolbar_icons()
 
