From 874b6f9a04e1c1613afd894adefcd8b036f0f621 Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Mon, 30 Jan 2023 16:47:44 +0000
Subject: [PATCH 1/7] Test on Python 3.11

---
 .github/workflows/test_and_deploy.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
index 38af0b1..ea3c8a0 100644
--- a/.github/workflows/test_and_deploy.yml
+++ b/.github/workflows/test_and_deploy.yml
@@ -23,15 +23,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # Run all supported Python versions on linux
-        python-version: ["3.8", "3.9", "3.10"]
         os: [ubuntu-latest]
-        # Include one windows and macos run
+        # Run across a mixture of Python versions and operating systems
         include:
+        - os: ubuntu-latest
+          python-version: "3.11"
         - os: macos-latest
           python-version: "3.10"
         - os: windows-latest
-          python-version: "3.10"
+          python-version: "3.9"
+        - os: ubuntu-latest
+          python-version: "3.8"
+
 
     steps:
       # Setup pyqt libraries

From 532f75c27e03f69bf4c37c8d455890f00e68a605 Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Mon, 30 Jan 2023 16:54:02 +0000
Subject: [PATCH 2/7] Remove dependency of tests on linting

---
 .github/workflows/test_and_deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
index ea3c8a0..dc814b9 100644
--- a/.github/workflows/test_and_deploy.yml
+++ b/.github/workflows/test_and_deploy.yml
@@ -18,7 +18,6 @@ jobs:
       - uses: brainglobe/actions/check_manifest@v1
 
   test:
-    needs: [linting, manifest]
     name: ${{ matrix.os }} py${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     strategy:

From cd0f95e4b0374f0ec3d15ddbd5533a43a51e677a Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Mon, 30 Jan 2023 17:04:48 +0000
Subject: [PATCH 3/7] Fix tox file

---
 tox.ini | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 451b39a..235f7fd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,20 @@
 # For more information about tox, see https://tox.readthedocs.io/en/latest/
 [tox]
-envlist = py{38,39}
+envlist = py{38,39,310,311}
 
 [gh-actions]
 python =
     3.8: py38
     3.9: py39
+    3.10: py310
+    3.11: py311
 
 [testenv]
 passenv =
     CI
     GITHUB_ACTIONS
-    DISPLAY XAUTHORITY
+    DISPLAY
+    XAUTHORITY
     NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
     PYVISTA_OFF_SCREEN
 deps =

From 510575a18d0094bdca846cecd7d32ab7355ad39b Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Mon, 30 Jan 2023 17:07:24 +0000
Subject: [PATCH 4/7] Fix scikit-image dep

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index aea5f42..7c0164e 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
     "magicgui",
     "numpy",
     "qtpy",
-    "skimage",
+    "scikit-image",
     "tifffile",
     "pooch>=1",  # For downloading sample data
 ]

From 355b943828e6b4540b0b49c4067cb8b29596b50d Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Mon, 30 Jan 2023 17:18:02 +0000
Subject: [PATCH 5/7] Update pre-commit versions

---
 .pre-commit-config.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ff3d144..53d7799 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 repos:
     - repo: https://github.com/pycqa/isort
-      rev: 5.10.1
+      rev: 5.12.0
       hooks:
           - id: isort
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.3.0
+      rev: v4.4.0
       hooks:
           - id: check-docstring-first
           - id: check-executables-have-shebangs
@@ -19,10 +19,10 @@ repos:
             # not inferfere with versioning
             exclude: setup.cfg
     - repo: https://github.com/pycqa/flake8
-      rev: 5.0.4
+      rev: 6.0.0
       hooks:
           - id: flake8
     - repo: https://github.com/psf/black
-      rev: 22.10.0
+      rev: 22.12.0
       hooks:
           - id: black

From c591b307e21ca93a9760b21eda82691643591f86 Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Mon, 30 Jan 2023 17:22:30 +0000
Subject: [PATCH 6/7] Remove redundant os field

---
 .github/workflows/test_and_deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
index dc814b9..0f9c844 100644
--- a/.github/workflows/test_and_deploy.yml
+++ b/.github/workflows/test_and_deploy.yml
@@ -22,7 +22,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
         # Run across a mixture of Python versions and operating systems
         include:
         - os: ubuntu-latest

From e7074be07fa16cfaffa3633bf829debe9d2e2e2f Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Mon, 30 Jan 2023 17:22:40 +0000
Subject: [PATCH 7/7] Add py 3.11 to package classifiers

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 7c0164e..ee8ea33 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Operating System :: OS Independent",
     ],
     entry_points={