From d68cf12d2668387e31cdce2890b95dbbc696833e Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 08:37:36 -0400 Subject: [PATCH 01/20] ci: attempt1 --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 575a0057..648039ee 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -30,7 +30,7 @@ jobs: matrix: platform: [ubuntu-latest, windows-latest, macos-13] python-version: ["3.8", "3.9", "3.10", "3.11"] - backend: [pyqt5, pyside2, "'PyQt6<6.6'"] + backend: [pyqt5, pyside2, pyqt6] exclude: # Abort (core dumped) on linux pyqt6, unknown reason - platform: ubuntu-latest From 025d6b05da9602dbc3ae7ef8cebab2f7a15f8467 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 08:44:05 -0400 Subject: [PATCH 02/20] add lxml_html_clean --- .github/workflows/test_and_deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 648039ee..7246883c 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -86,10 +86,11 @@ jobs: qt: ${{ matrix.qt }} pytest-args: 'napari/_qt -k "not async and not qt_dims_2"' python-version: "3.10" + post-install-cmd: 'pip install lxml_html_clean' strategy: fail-fast: false matrix: - napari-version: ["", "v0.4.18"] + napari-version: ["", "v0.4.19post1"] qt: ["pyqt5", "pyside2"] check-manifest: From 7b07faab2b35f0bcd4a1bed11dd7f60caa21b212 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 08:48:02 -0400 Subject: [PATCH 03/20] fix napari version name --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 7246883c..6c908801 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -90,7 +90,7 @@ jobs: strategy: fail-fast: false matrix: - napari-version: ["", "v0.4.19post1"] + napari-version: ["", "v0.4.19.post1"] qt: ["pyqt5", "pyside2"] check-manifest: From dc0bfcbeb3e9586b419676a1449c5fb5e615babe Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 12:48:38 -0400 Subject: [PATCH 04/20] breakout coverage --- .github/workflows/test_and_deploy.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 6c908801..ca3d1fef 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -23,8 +23,7 @@ jobs: qt: ${{ matrix.backend }} pip-install-pre-release: ${{ github.event_name == 'schedule' }} report-failures: ${{ github.event_name == 'schedule' }} - secrets: - codecov-token: ${{ secrets.CODECOV_TOKEN }} + coverage-upload: artifact strategy: fail-fast: false matrix: @@ -71,11 +70,16 @@ jobs: test-qt-minreqs: uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@v1 - secrets: inherit with: python-version: "3.8" qt: pyqt5 pip-post-installs: 'qtpy==1.1.0 typing-extensions==3.7.4.3' + coverage-upload: artifact + + upload_coverage: + needs: [test, test-qt-minreqs] + uses: pyapp-kit/workflows/.github/workflows/upload-coverage.yml@v1 + secrets: inherit test_napari: uses: pyapp-kit/workflows/.github/workflows/test-dependents.yml@v1 From 0445e3127d2e5120c6e117bbcfe7a5060e073ca6 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 12:52:02 -0400 Subject: [PATCH 05/20] use main --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index ca3d1fef..e9cebb84 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -16,7 +16,7 @@ on: jobs: test: name: Test - uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@v1 + uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@main with: os: ${{ matrix.platform }} python-version: ${{ matrix.python-version }} From ebe198f650da7f3ba53a27c3457bdd86e4913ad4 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 13:41:20 -0400 Subject: [PATCH 06/20] cump --- .github/workflows/test_and_deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index e9cebb84..dd7593bb 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -76,6 +76,7 @@ jobs: pip-post-installs: 'qtpy==1.1.0 typing-extensions==3.7.4.3' coverage-upload: artifact + upload_coverage: needs: [test, test-qt-minreqs] uses: pyapp-kit/workflows/.github/workflows/upload-coverage.yml@v1 From 2b35aa8a6588caf97f2279d445bdd3d573e48aa7 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 13:41:27 -0400 Subject: [PATCH 07/20] bump again --- .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 dd7593bb..e9cebb84 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -76,7 +76,6 @@ jobs: pip-post-installs: 'qtpy==1.1.0 typing-extensions==3.7.4.3' coverage-upload: artifact - upload_coverage: needs: [test, test-qt-minreqs] uses: pyapp-kit/workflows/.github/workflows/upload-coverage.yml@v1 From 6d74d5bec0c6864876b3a6d2e7359694c2a92860 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 13:45:20 -0400 Subject: [PATCH 08/20] bump From f73fdcf5ce346ab166948a686dc9ffc2c73d866f Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 13:50:48 -0400 Subject: [PATCH 09/20] bump From 0ebb215cc8cebf7708c17c948c578c720953dcb9 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 13:53:23 -0400 Subject: [PATCH 10/20] skip more napari tests --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index e9cebb84..8f12e46b 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -88,7 +88,7 @@ jobs: dependency-ref: ${{ matrix.napari-version }} dependency-extras: 'testing' qt: ${{ matrix.qt }} - pytest-args: 'napari/_qt -k "not async and not qt_dims_2"' + pytest-args: 'napari/_qt -k "not async and not qt_dims_2 and not qt_viewer_console_focus and not keybinding_editor"' python-version: "3.10" post-install-cmd: 'pip install lxml_html_clean' strategy: From 82806adc9cdda0014eda68abe4ef5a4393a29ac3 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 13:55:04 -0400 Subject: [PATCH 11/20] add always --- .github/workflows/test_and_deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 8f12e46b..6f459720 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -78,6 +78,7 @@ jobs: upload_coverage: needs: [test, test-qt-minreqs] + if: always() uses: pyapp-kit/workflows/.github/workflows/upload-coverage.yml@v1 secrets: inherit From 0c2bc948789949e7c3b6d191af3e8b93b8e70c73 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 13:59:58 -0400 Subject: [PATCH 12/20] back to v1 --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 6f459720..010c2c3b 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -16,7 +16,7 @@ on: jobs: test: name: Test - uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@main + uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@v1 with: os: ${{ matrix.platform }} python-version: ${{ matrix.python-version }} From 1b463a85f96701c5f484af74518b5be4e461b13a Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 14:35:13 -0400 Subject: [PATCH 13/20] try editabel --- .github/workflows/test_and_deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 010c2c3b..40c3ddfa 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -21,6 +21,7 @@ jobs: os: ${{ matrix.platform }} python-version: ${{ matrix.python-version }} qt: ${{ matrix.backend }} + pip-install-flags: -e pip-install-pre-release: ${{ github.event_name == 'schedule' }} report-failures: ${{ github.event_name == 'schedule' }} coverage-upload: artifact @@ -74,6 +75,7 @@ jobs: python-version: "3.8" qt: pyqt5 pip-post-installs: 'qtpy==1.1.0 typing-extensions==3.7.4.3' + pip-install-flags: -e coverage-upload: artifact upload_coverage: From e4be57595f48fd9c92788f9e02dff3c83ba940d0 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 14:52:04 -0400 Subject: [PATCH 14/20] use main again --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 40c3ddfa..79232d5a 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -81,7 +81,7 @@ jobs: upload_coverage: needs: [test, test-qt-minreqs] if: always() - uses: pyapp-kit/workflows/.github/workflows/upload-coverage.yml@v1 + uses: pyapp-kit/workflows/.github/workflows/upload-coverage.yml@main secrets: inherit test_napari: From 3a556dcff4fc818dfa1f0b3533a894424c9f6e48 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 14:52:28 -0400 Subject: [PATCH 15/20] remove editable --- .github/workflows/test_and_deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 79232d5a..2d8490fb 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -21,7 +21,6 @@ jobs: os: ${{ matrix.platform }} python-version: ${{ matrix.python-version }} qt: ${{ matrix.backend }} - pip-install-flags: -e pip-install-pre-release: ${{ github.event_name == 'schedule' }} report-failures: ${{ github.event_name == 'schedule' }} coverage-upload: artifact @@ -75,7 +74,6 @@ jobs: python-version: "3.8" qt: pyqt5 pip-post-installs: 'qtpy==1.1.0 typing-extensions==3.7.4.3' - pip-install-flags: -e coverage-upload: artifact upload_coverage: From 82b020719a7295148b3eff52297e46faedb2cdd2 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 15:08:17 -0400 Subject: [PATCH 16/20] editable again --- .github/workflows/test_and_deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 2d8490fb..79232d5a 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -21,6 +21,7 @@ jobs: os: ${{ matrix.platform }} python-version: ${{ matrix.python-version }} qt: ${{ matrix.backend }} + pip-install-flags: -e pip-install-pre-release: ${{ github.event_name == 'schedule' }} report-failures: ${{ github.event_name == 'schedule' }} coverage-upload: artifact @@ -74,6 +75,7 @@ jobs: python-version: "3.8" qt: pyqt5 pip-post-installs: 'qtpy==1.1.0 typing-extensions==3.7.4.3' + pip-install-flags: -e coverage-upload: artifact upload_coverage: From 889ce32b8257aa20fade296484676c49fb1a694e Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 15:16:29 -0400 Subject: [PATCH 17/20] bump From 6ad4a954ed7bfc9bdc8a321d249ad034fb841026 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 15:35:35 -0400 Subject: [PATCH 18/20] bump From 9b9f81b19002061c7f3cf610c7e5f42e02b48066 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sun, 5 May 2024 15:42:54 -0400 Subject: [PATCH 19/20] bump From ce1cf57802ba4f2908eafeaf9746ee5c772134b8 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Mon, 6 May 2024 15:07:19 -0400 Subject: [PATCH 20/20] use v2 --- .github/workflows/test_and_deploy.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 79232d5a..0c96618e 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -16,14 +16,12 @@ on: jobs: test: name: Test - uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@v1 + uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@v2 with: os: ${{ matrix.platform }} python-version: ${{ matrix.python-version }} qt: ${{ matrix.backend }} - pip-install-flags: -e pip-install-pre-release: ${{ github.event_name == 'schedule' }} - report-failures: ${{ github.event_name == 'schedule' }} coverage-upload: artifact strategy: fail-fast: false @@ -38,7 +36,6 @@ jobs: # lack of wheels for pyside2/py3.11 - python-version: "3.11" backend: pyside2 - include: # https://bugreports.qt.io/browse/PYSIDE-2627 - python-version: "3.10" @@ -53,11 +50,9 @@ jobs: - python-version: "3.11" platform: windows-latest backend: "'pyside6!=6.6.2'" - - python-version: "3.12" platform: macos-latest backend: "'PyQt6<6.6'" - # legacy Qt - python-version: 3.8 platform: ubuntu-latest @@ -70,7 +65,7 @@ jobs: backend: "pyqt5==5.14.*" test-qt-minreqs: - uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@v1 + uses: pyapp-kit/workflows/.github/workflows/test-pyrepo.yml@v2 with: python-version: "3.8" qt: pyqt5 @@ -79,13 +74,13 @@ jobs: coverage-upload: artifact upload_coverage: - needs: [test, test-qt-minreqs] if: always() - uses: pyapp-kit/workflows/.github/workflows/upload-coverage.yml@main + needs: [test, test-qt-minreqs] + uses: pyapp-kit/workflows/.github/workflows/upload-coverage.yml@v2 secrets: inherit test_napari: - uses: pyapp-kit/workflows/.github/workflows/test-dependents.yml@v1 + uses: pyapp-kit/workflows/.github/workflows/test-dependents.yml@v2 with: dependency-repo: napari/napari dependency-ref: ${{ matrix.napari-version }}