From a851e0752f91f67fe36f91c3c5bff26df90cf6b3 Mon Sep 17 00:00:00 2001 From: Corran Webster Date: Wed, 19 Apr 2023 08:16:34 +0100 Subject: [PATCH 1/6] Try 3.11 tests on linux with null backend. --- .github/workflows/test-with-pip.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 0ffc296c..ee92c837 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -15,6 +15,10 @@ jobs: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] toolkit: ['null', 'pyside2', 'pyside6', 'pyqt5', 'wx'] python-version: ['3.8', '3.10'] + include: + - os: 'ubuntu-latest' + toolkit: 'null' + python-version: '3.11' exclude: # No Wx wheels available for ubuntu or macos - os: 'ubuntu-latest' From 6ff06c28f99cc5251673393dd74f20f1d2ea7618 Mon Sep 17 00:00:00 2001 From: Corran Webster Date: Wed, 19 Apr 2023 09:38:29 +0100 Subject: [PATCH 2/6] Do more tests using 3.11. --- .github/workflows/bleeding-edge.yml | 13 ++++++------- .github/workflows/test-with-pip.yml | 15 ++++++++++----- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/bleeding-edge.yml b/.github/workflows/bleeding-edge.yml index 4c801c75..6a475585 100644 --- a/.github/workflows/bleeding-edge.yml +++ b/.github/workflows/bleeding-edge.yml @@ -13,14 +13,13 @@ jobs: strategy: matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] - toolkit: ['null', 'pyside6', 'wx'] - python-version: ['3.10'] - exclude: - # No Wx wheels available for ubuntu or macos - - os: 'ubuntu-latest' - toolkit: 'wx' - - os: 'macos-latest' + toolkit: ['null', 'pyside6'] + python-version: ['3.11'] + include: + # No Wx wheels available for Python 3.11, so test on 3.10 + - os: 'windows-latest' toolkit: 'wx' + python-version: '3.10' runs-on: ${{ matrix.os }} steps: - name: Check out diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index ee92c837..eeb1a917 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -14,12 +14,17 @@ jobs: matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] toolkit: ['null', 'pyside2', 'pyside6', 'pyqt5', 'wx'] - python-version: ['3.8', '3.10'] - include: - - os: 'ubuntu-latest' - toolkit: 'null' - python-version: '3.11' + python-version: ['3.8', '3.10', '3.11'] exclude: + # No Wx wheels available for Python 3.11 + - toolkit: 'wx' + python-version: '3.11' + # No PySide2 wheels available for Python 3.11 + - toolkit: 'pyside2' + python-version: '3.11' + # No PyQt5 wheels available for Python 3.11 + - toolkit: 'pyqt5' + python-version: '3.11' # No Wx wheels available for ubuntu or macos - os: 'ubuntu-latest' toolkit: 'wx' From 4339edf379f1298010583f2b7b72a3fa7c773aee Mon Sep 17 00:00:00 2001 From: Corran Webster Date: Wed, 19 Apr 2023 10:03:12 +0100 Subject: [PATCH 3/6] Let's see if having Python available makes old celiagg install. --- .github/workflows/test-with-pip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index eeb1a917..07960173 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -57,7 +57,7 @@ jobs: if: matrix.os == 'macos-latest' - name: Install build dependencies run: | - python -m pip install --upgrade pip wheel + python -m pip install --upgrade pip wheel cython - name: Install local packages run: pip install ".[cairo,layout,pdf,svg,test,${{ matrix.toolkit }}]" - name: Install celiagg manually From 09f2130a043f2cb654d9244efc3a2bcea30f89ba Mon Sep 17 00:00:00 2001 From: Corran Webster Date: Wed, 19 Apr 2023 10:18:55 +0100 Subject: [PATCH 4/6] Update install celiagg main in tests. --- .github/workflows/test-with-pip.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 07960173..2f56c25e 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -57,13 +57,12 @@ jobs: if: matrix.os == 'macos-latest' - name: Install build dependencies run: | - python -m pip install --upgrade pip wheel cython + python -m pip install --upgrade pip wheel - name: Install local packages run: pip install ".[cairo,layout,pdf,svg,test,${{ matrix.toolkit }}]" - - name: Install celiagg manually + - name: Install celiagg main branch manually # This is needed until new release of celiagg - # - numpy is needed for install in current released version - run: pip install celiagg + run: pip install git+https://github.com/celiagg/celiagg.git - name: Sanity check package version run: pip list - name: Run kiva test suite (Linux) From 731cfadeb65cbccf047fc0dd6e1d2c3d84103f12 Mon Sep 17 00:00:00 2001 From: Corran Webster Date: Fri, 21 Apr 2023 12:51:47 +0100 Subject: [PATCH 5/6] Use celiagg maintenance branch until celiagg has a release. --- .github/workflows/test-with-pip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 779c7bf7..6c85fa8d 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -62,7 +62,7 @@ jobs: run: pip install ".[cairo,layout,pdf,svg,test,${{ matrix.toolkit }}]" - name: Install celiagg main branch manually # This is needed until new release of celiagg - run: pip install git+https://github.com/celiagg/celiagg.git + run: pip install git+https://github.com/celiagg/celiagg.git@rel/2.1.x - name: Sanity check package version run: pip list - name: Run kiva test suite (Linux) From 642d87e7988027c6efd2bfcf1bac7159062beaff Mon Sep 17 00:00:00 2001 From: Corran Webster Date: Tue, 2 May 2023 11:32:57 +0100 Subject: [PATCH 6/6] No longer install celiagg from git. --- .github/workflows/test-with-pip.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 6c85fa8d..433c4fb9 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -59,10 +59,7 @@ jobs: run: | python -m pip install --upgrade pip wheel - name: Install local packages - run: pip install ".[cairo,layout,pdf,svg,test,${{ matrix.toolkit }}]" - - name: Install celiagg main branch manually - # This is needed until new release of celiagg - run: pip install git+https://github.com/celiagg/celiagg.git@rel/2.1.x + run: pip install ".[celiagg,cairo,layout,pdf,svg,test,${{ matrix.toolkit }}]" - name: Sanity check package version run: pip list - name: Run kiva test suite (Linux)