From 396f9d4519da760e784ea346605b0cf839f79621 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Wed, 23 Nov 2022 08:08:41 +0100 Subject: [PATCH 1/6] Update Python versions in the ci workflow. --- .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 2a45a49d..b03b6868 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - python-version: ["3.9", "3.10"] + python-version: ["3.9", "3.10", "3.11", "3.12-dev"] steps: - uses: actions/checkout@v2 From c01dfc52e36b3b2f0fcfe093956eaaf2b6a272e9 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Wed, 23 Nov 2022 08:33:14 +0100 Subject: [PATCH 2/6] Bump `actions/setup-python` to v4. --- .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 b03b6868..191a5e0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }} restore-keys: | ${{ runner.os }}-pip- - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - run: python3 -m pip install -U -r dev-requirements.txt From 8a0668903329f6333c650be2f070f78821b6928d Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Dec 2022 09:48:54 -0500 Subject: [PATCH 3/6] Pin kombu on Python 3.12. Workaround for celery/kombu#1600 --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index cd54c81a..7ebb3265 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,6 @@ redis==4.3.4 celery==5.2.7 sentry-sdk==1.10.1 click==8.1.3 + +# workaround for celery/kombu#1600 +kombu==5.3.0b2; python_version>="3.12" From 49e1f6f757c7071df9065e112d877b7cf9a97b6b Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sun, 25 Dec 2022 06:31:29 +0100 Subject: [PATCH 4/6] Decouple "-dev" suffix from version list. --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 191a5e0a..75a8d93e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,9 @@ jobs: strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12-dev"] + python-version: ["3.9", "3.10", "3.11", "3.12"] + # Workaround for actions/setup-python#508 + dev: ["-dev"] steps: - uses: actions/checkout@v2 @@ -25,7 +27,7 @@ jobs: ${{ runner.os }}-pip- - uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }} + python-version: ${{ matrix.python-version }}${{ matrix.dev }} - run: python3 -m pip install -U -r dev-requirements.txt - run: pytest --cov=. --cov-report=xml - uses: codecov/codecov-action@v2 From 7c5767c2fca4d13df496438a03e17113d5761380 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Tue, 2 May 2023 16:07:09 +0200 Subject: [PATCH 5/6] Update release matrix strategy. Co-authored-by: Hugo van Kemenade --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75a8d93e..2b1d393d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,6 @@ jobs: strategy: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] - # Workaround for actions/setup-python#508 - dev: ["-dev"] steps: - uses: actions/checkout@v2 @@ -27,7 +25,8 @@ jobs: ${{ runner.os }}-pip- - uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }}${{ matrix.dev }} + python-version: ${{ matrix.python-version }} + allow-prereleases: true - run: python3 -m pip install -U -r dev-requirements.txt - run: pytest --cov=. --cov-report=xml - uses: codecov/codecov-action@v2 From 995f937a7730e5312878a1f7f8cb79ca352a9b28 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Tue, 2 May 2023 16:34:47 +0200 Subject: [PATCH 6/6] Comment out 3.12 until it's fixed. --- .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 68a6d31d..d6e63da5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11"] # see #590 for "3.12" steps: - uses: actions/checkout@v3