From 6f4f7b7d512311ecf9fef99644b4efc90471d65b Mon Sep 17 00:00:00 2001 From: Robert Craigie Date: Wed, 26 Oct 2022 08:26:40 +0100 Subject: [PATCH 1/7] feat(project): add support for Python 3.11 --- .github/workflows/test.yml | 2 +- setup.py | 1 + tox.ini | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 67caa59..a3a00f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] node: [12, 14, 16] - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v1 diff --git a/setup.py b/setup.py index 3fd8fb1..405c5ec 100755 --- a/setup.py +++ b/setup.py @@ -70,5 +70,6 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ], ) diff --git a/tox.ini b/tox.ini index 3ad215c..55e3de4 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,7 @@ envlist = py38, py39, py310, + py311, report, skip_missing_interpreters = true From d34e31d10c1bc06ba70eab2c81f651cbe55b2d8b Mon Sep 17 00:00:00 2001 From: Robert Craigie Date: Wed, 26 Oct 2022 08:37:08 +0100 Subject: [PATCH 2/7] Bump action versions --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a3a00f3..4e9cc0f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 # TODO: ensure that pyright-python uses this node version - uses: actions/setup-node@v2 @@ -35,7 +35,7 @@ jobs: node-version: ${{ matrix.node }} - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -74,10 +74,10 @@ jobs: python-version: [3.9] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} From 312571b6b0e96bb543a7477acda00f540025fb05 Mon Sep 17 00:00:00 2001 From: Robert Craigie Date: Wed, 26 Oct 2022 09:31:09 +0100 Subject: [PATCH 3/7] Fix python version --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e9cc0f..1b4f79c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] node: [12, 14, 16] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0'] steps: - uses: actions/checkout@v3 From 1e20b7ce337973dd32af736a7d2c6c2e2594f992 Mon Sep 17 00:00:00 2001 From: Robert Craigie Date: Wed, 26 Oct 2022 09:34:44 +0100 Subject: [PATCH 4/7] try rc 2 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1b4f79c..cc29697 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] node: [12, 14, 16] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0.rc-2'] steps: - uses: actions/checkout@v3 From 1deb7d9b9dafd0cbf2cad5218a976b9a7fd6eb12 Mon Sep 17 00:00:00 2001 From: Robert Craigie Date: Wed, 26 Oct 2022 09:52:58 +0100 Subject: [PATCH 5/7] Skip 3.11.0 on MacOS --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc29697..9ed33d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,11 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] node: [12, 14, 16] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0.rc-2'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0'] + + # Python 3.11 is currently broken in `setup-python` on MacOS + # https://github.com/actions/setup-python/issues/531 + if: matrix.python-version != '3.11.0' && matrix.os != 'macos-latest' steps: - uses: actions/checkout@v3 From e242adb4f204e9d98905abf26bdc3bc5341f5ecb Mon Sep 17 00:00:00 2001 From: Robert Craigie Date: Wed, 26 Oct 2022 09:57:12 +0100 Subject: [PATCH 6/7] empty commit --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ed33d7..30b142a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,6 @@ jobs: os: [ubuntu-latest, macos-latest] node: [12, 14, 16] python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0'] - # Python 3.11 is currently broken in `setup-python` on MacOS # https://github.com/actions/setup-python/issues/531 if: matrix.python-version != '3.11.0' && matrix.os != 'macos-latest' From 4c1dd06b8a34731e3039984d481299420a4ca5f7 Mon Sep 17 00:00:00 2001 From: Robert Craigie Date: Wed, 26 Oct 2022 10:04:36 +0100 Subject: [PATCH 7/7] Change condition strategy --- .github/workflows/test.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 30b142a..0a2d3a9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,9 +25,18 @@ jobs: os: [ubuntu-latest, macos-latest] node: [12, 14, 16] python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0'] - # Python 3.11 is currently broken in `setup-python` on MacOS - # https://github.com/actions/setup-python/issues/531 - if: matrix.python-version != '3.11.0' && matrix.os != 'macos-latest' + # Python 3.11 is currently broken in `setup-python` on MacOS + # https://github.com/actions/setup-python/issues/531 + exclude: + - os: macos-latest + python-version: '3.11.0' + node: 12 + - os: macos-latest + python-version: '3.11.0' + node: 14 + - os: macos-latest + python-version: '3.11.0' + node: 16 steps: - uses: actions/checkout@v3