From abce5579827008261992488ea1c9e0879ac09215 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Thu, 26 Oct 2023 20:29:46 -0400 Subject: [PATCH 01/10] use new napari test --- .github/workflows/ci.yml | 41 +++++----------------------------------- 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea46900d..68af02c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,43 +119,12 @@ jobs: uses: codecov/codecov-action@v3 test_napari: - name: napari (${{ matrix.napari-version }}, ${{ matrix.qt-backend }}) + name: napari (pyqt5) runs-on: ubuntu-latest - strategy: - matrix: - napari-version: [""] # "" is HEAD - qt-backend: [pyqt5, pyside2] - - steps: - - uses: actions/checkout@v4 - with: - path: app-model - - - uses: actions/checkout@v4 - with: - repository: napari/napari - path: napari - fetch-depth: 0 - ref: ${{ matrix.napari-version }} - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - uses: tlambert03/setup-qt-libs@v1 - - - name: Install dependencies - run: | - python -m pip install -U pip - python -m pip install -e app-model - python -m pip install -e napari[testing,${{ matrix.qt-backend }}] - - - name: Test - uses: aganders3/headless-gui@v1 - with: - working-directory: napari - run: python -m pytest napari/_qt napari/_app_model --color=yes -x + uses: napari/napari/.github/workflows/test_external_package_workflow.yml@main + with: + backend: "pyqt5" + pytest_path: "napari/_qt napari/_app_model" deploy: name: Deploy From 5275e4eca170e81d3217a7694c826060712b5100 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Thu, 26 Oct 2023 20:30:13 -0400 Subject: [PATCH 02/10] use czaki --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68af02c3..baf2ea87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,7 +121,7 @@ jobs: test_napari: name: napari (pyqt5) runs-on: ubuntu-latest - uses: napari/napari/.github/workflows/test_external_package_workflow.yml@main + uses: czaki/napari/.github/workflows/test_external_package_workflow.yml@main with: backend: "pyqt5" pytest_path: "napari/_qt napari/_app_model" From 5ce6c1dc4641ff1f7d80b23f96fbfba7f27ee5d6 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Thu, 26 Oct 2023 20:35:15 -0400 Subject: [PATCH 03/10] fix uses --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index baf2ea87..7f18115a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,7 +121,7 @@ jobs: test_napari: name: napari (pyqt5) runs-on: ubuntu-latest - uses: czaki/napari/.github/workflows/test_external_package_workflow.yml@main + uses: czaki/napari/.github/workflows/test_external_package_workflow.yml@feature/test_against_napari with: backend: "pyqt5" pytest_path: "napari/_qt napari/_app_model" From d2c4bf80a84c9ddd27ac62c48c085f696970ec32 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Thu, 26 Oct 2023 20:36:56 -0400 Subject: [PATCH 04/10] try without with --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f18115a..313ac873 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,9 +122,9 @@ jobs: name: napari (pyqt5) runs-on: ubuntu-latest uses: czaki/napari/.github/workflows/test_external_package_workflow.yml@feature/test_against_napari - with: - backend: "pyqt5" - pytest_path: "napari/_qt napari/_app_model" + # with: + # backend: "pyqt5" + # pytest_path: "napari/_qt napari/_app_model" deploy: name: Deploy From a7112e50e66a0decf3673036f4e3078a43974703 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Thu, 26 Oct 2023 20:38:00 -0400 Subject: [PATCH 05/10] fix runs on --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 313ac873..f0b12e2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,11 +120,10 @@ jobs: test_napari: name: napari (pyqt5) - runs-on: ubuntu-latest uses: czaki/napari/.github/workflows/test_external_package_workflow.yml@feature/test_against_napari - # with: - # backend: "pyqt5" - # pytest_path: "napari/_qt napari/_app_model" + with: + backend: "pyqt5" + pytest_path: "napari/_qt napari/_app_model" deploy: name: Deploy From 6d520fc0217cfe5740d6a3bdd1c74b06fb0a96e8 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 29 Oct 2023 09:51:24 -0400 Subject: [PATCH 06/10] trigger ci From 18c432adb5c361118c7fad6d41ed3a14c21272b1 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 29 Oct 2023 10:09:38 -0400 Subject: [PATCH 07/10] more backends --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0b12e2d..ad3fdf1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,11 +119,11 @@ jobs: uses: codecov/codecov-action@v3 test_napari: - name: napari (pyqt5) + name: napari uses: czaki/napari/.github/workflows/test_external_package_workflow.yml@feature/test_against_napari with: - backend: "pyqt5" - pytest_path: "napari/_qt napari/_app_model" + backend: "pyqt5,pyside2,pyqt6" + pytest_path: "napari/_qt napari/_app_model -W ignore" deploy: name: Deploy From 6a1bab16bacd62a97a77ad84dd2146b7a97659c8 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 29 Oct 2023 10:22:21 -0400 Subject: [PATCH 08/10] remove -w ignore --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad3fdf1a..70522e99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,7 +123,7 @@ jobs: uses: czaki/napari/.github/workflows/test_external_package_workflow.yml@feature/test_against_napari with: backend: "pyqt5,pyside2,pyqt6" - pytest_path: "napari/_qt napari/_app_model -W ignore" + pytest_path: "napari/_qt napari/_app_model" deploy: name: Deploy From 71c51b159457e586af7dfcd08dd5e5672805a218 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 29 Oct 2023 12:34:30 -0400 Subject: [PATCH 09/10] use matrix instead --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70522e99..e615f487 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,9 +120,13 @@ jobs: test_napari: name: napari + strategy: + fail-fast: false + matrix: + backend: [pyqt5, pyside2, pyqt6] uses: czaki/napari/.github/workflows/test_external_package_workflow.yml@feature/test_against_napari with: - backend: "pyqt5,pyside2,pyqt6" + backend: ${{ matrix.backend }} pytest_path: "napari/_qt napari/_app_model" deploy: From 8a9f5b66856d3beed7327e39d835447d3e9fa860 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 29 Oct 2023 14:41:14 -0400 Subject: [PATCH 10/10] try without test notification --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e615f487..016b9c72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: uses: czaki/napari/.github/workflows/test_external_package_workflow.yml@feature/test_against_napari with: backend: ${{ matrix.backend }} - pytest_path: "napari/_qt napari/_app_model" + pytest_path: "napari/_qt napari/_app_model -W ignore -k 'not test_notification and not playing_after_ndisplay_changes'" deploy: name: Deploy