fix magicgui

pyapp-kit · Nov 14, 2023 · 825f22e · 825f22e
1 parent 9a12753
commit 825f22e
Showing 1 changed file with 22 additions and 21 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,55 +29,56 @@ jobs:
     with:
       os: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}
-      qt: ${{ matrix.qt }}
       pip-post-installs: ${{ matrix.pydantic }}
-      extras: ${{ matrix.qt == '' && 'test' || 'test,testqt' }}
       fail-on-coverage-error: true
       hatch-build-hooks-enable: ${{ matrix.compile }}
       pip-install-pre-release: ${{ github.event_name == 'schedule' }}
       report-failures: ${{ github.event_name == 'schedule' }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, macos-latest, windows-latest]
-        qt: [""]
         compile: [true, false]
         include:
-          - os: ubuntu-latest
-            python-version: "3.10"
-            qt: "PyQt5"
-          - os: macos-latest
-            python-version: "3.10"
-            qt: "PyQt6"
-          - os: ubuntu-latest
-            python-version: "3.10"
-            qt: "PySide2"
-          - os: macos-latest
-            python-version: "3.10"
-            qt: "PySide6"
           - os: ubuntu-latest
             python-version: "3.11"
             pydantic: "'pydantic<2'"
           - os: windows-latest
             python-version: "3.11"
             pydantic: "'pydantic<2'"
-          - os: ubuntu-latest
-            python-version: "3.12"
-            qt: ""
+
+  test-qt:
+    name: Test Qt
+    uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@v1
+    with:
+      os: ${{ matrix.os }}
+      python-version: ${{ matrix.python-version }}
+      qt: ${{ matrix.qt }}
+      extras: 'test,testqt'
+      hatch-build-hooks-enable: ${{ matrix.compile }}
+      pip-install-pre-release: ${{ github.event_name == 'schedule' }}
+      report-failures: ${{ github.event_name == 'schedule' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10"]
+        os: [macos-latest, windows-latest]
+        qt: [PyQt5, PyQt6, PySide2, PySide6]
+        compile: [true, false]
 
   test-magicgui:
     uses: pyapp-kit/workflows/.github/workflows/test-dependents.yml@v1
     with:
       dependency-repo: pyapp-kit/magicgui
-      dependency-ref: ${{ matrix.napari-version }}
+      dependency-ref: ${{ matrix.dependency-version }}
       dependency-extras: 'testing'
       qt: ${{ matrix.qt }}
       python-version: "3.10"
     strategy:
       fail-fast: false
       matrix:
-        napari-version: ["", "v0.4.18"]
+        dependency-version: ["", "v0.6.0"]
         qt: ["pyside2"]
 
   typing: