Merge branch 'add-feature-histogram' of https://github.com/jo-mueller/napari-matplotlib into add-feature-histogram

Author: jo-mueller

.github/workflows/docs.yml

@@ -6,7 +6,7 @@ on:
       - main
 
 jobs:
-  build-and-upload:
+  build-docs:
     name: Build & Upload Artifact
     runs-on: ubuntu-latest
     steps:
@@ -22,6 +22,8 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install ".[docs]"
+          sudo apt install graphviz --yes
+
       - name: Build Docs
         uses: aganders3/headless-gui@v1
         with:
@@ -33,3 +35,21 @@ jobs:
         with:
           name: docs
           path: docs/_build
+
+  upload-docs:
+    name: Upload docs to GitHub pages
+    runs-on: ubuntu-latest
+    needs: build-docs
+    if: github.event_name == 'push' && github.ref_name == 'main'
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v3
+      with:
+        name: docs
+
+    - name: Push to GitHub pages
+      uses: JamesIves/github-pages-deploy-action@v4
+      with:
+        folder: html
+        ssh-key: ${{ secrets.DEPLOY_KEY }}
+        repository-name: dstansby/napari-matplotlib-docs

.github/workflows/napari_hub_preview.yml

@@ -13,9 +13,9 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: napari hub Preview Page Builder
-        uses: chanzuckerberg/napari-hub-preview-action@v0.1.5
+        uses: chanzuckerberg/napari-hub-preview-action@v0.1
         with:
           hub-ref: main

.github/workflows/test_and_deploy.yml

@@ -17,6 +17,7 @@ jobs:
     name: ${{ matrix.platform }} py${{ matrix.python-version }}
     runs-on: ${{ matrix.platform }}
     strategy:
+      fail-fast: false
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
         python-version: ['3.8', '3.9', '3.10']
@@ -57,7 +58,13 @@ jobs:
         if: ${{ always() }}
 
       - name: Coverage
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
+        # Don't run coverage on merge queue CI to avoid duplicating reports
+        # to codecov. See https://github.com/matplotlib/napari-matplotlib/issues/155
+        if: github.event_name != 'merge_group'
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
 
   deploy:
     # this will run when you have tagged a commit, starting with "v*"

.napari/DESCRIPTION.md

@@ -0,0 +1,8 @@
+labels:
+  ontology: EDAM-BIOIMAGING:alpha06
+  terms:
+  - 2D Image
+  - 3D Image
+  - Plotting
+  - Slice rendering
+  - Scientific visualisation

.napari/config.yml

@@ -7,7 +7,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.2.0
+    rev: v2.3.0
     hooks:
       - id: setup-cfg-fmt
 
@@ -29,7 +29,7 @@ repos:
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.0.270'
+    rev: 'v0.0.272'
     hooks:
       - id: ruff
 

.pre-commit-config.yaml

@@ -1,5 +1,6 @@
 include LICENSE
 include README.md
+recursive-include * *.mplstyle
 
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]

MANIFEST.in

@@ -28,6 +28,7 @@ Changes
 - ``NapariMPLWidget.update_layers()`` has been removed as it is intended to be
   private API. Use ``NapariMPLWidget.on_update_layers`` instead to implement
   funcitonality when layer selection is changed.
+- The slice widget now only plots x-ticks at integer locations.
 
 Bug fixes
 ~~~~~~~~~

docs/changelog.rst

@@ -49,7 +49,8 @@
 }
 
 numpydoc_show_class_members = False
-automodapi_inheritance_diagram = False
+automodapi_inheritance_diagram = True
+inheritance_graph_attrs = {"rankdir": "TR"}
 
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3/", None),
@@ -60,11 +61,14 @@
 }
 
 nitpicky = True
-# Can't work out how to link this properley using intersphinx and the PyQT6 docs.
+# Can't work out how to link this properly using intersphinx and the PyQT6 docs.
 # TODO: fix at some point
 nitpick_ignore = [
-    ("py:class", "PyQt6.QtWidgets.QWidget"),
     ("py:class", "PyQt5.QtWidgets.QWidget"),
+    ("py:class", "PyQt5.QtCore.QObject"),
+    ("py:class", "PyQt5.QtGui.QPaintDevice"),
+    ("py:class", "sip.simplewrapper"),
+    ("py:class", "sip.wrapper"),
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -88,3 +92,17 @@
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 # html_static_path = ['_static']
+
+html_theme_options = {
+    "icon_links": [
+        {
+            "name": "GitHub",
+            "url": "https://github.com/matplotlib/napari-matplotlib",
+            "icon": "fa-brands fa-square-github",
+            "type": "fontawesome",
+        }
+    ],
+    "logo": {
+        "text": "napari-matplotlib",
+    },
+}

docs/conf.py

@@ -4,4 +4,5 @@ Guide
 .. toctree::
    :maxdepth: 1
 
+   user_guide
    third_party