From ad94f7af12a2b107d2acd993dc50c136dc0a8a4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 04:57:15 +0000 Subject: [PATCH 1/6] Bump coverage from 7.2.5 to 7.2.7 Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.2.5 to 7.2.7. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.2.5...7.2.7) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 5ac6e4b..7eb547a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ -r requirements.txt -coverage==7.2.5 +coverage==7.2.7 pytest==7.3.1 pytest-aiohttp==1.0.4 pytest-mock==3.10.0 From 857434c9cee0f7366ea516a39f66e9fce957dee9 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 1 Jun 2023 12:54:22 +0300 Subject: [PATCH 2/6] Install dependencies from source for 3.12 alpha 4 Because coverage.py's wheel is built for the beta and ABI-incompatible. --- .github/workflows/ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c08a86a..3b038da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,16 @@ jobs: dev-requirements.txt requirements.txt - - name: Install dependencies + - name: Install dependencies (3.12) + if: matrix.python-version != '3.12.0-alpha.4' + run: | + # TODO remove when 3.12.0-alpha.4 pin removed. + # Need to install coverage.py from source because its + # wheel is built for the beta and ABI-incompatible. + python3 -m pip install -U -r dev-requirements.txt --no-binary :all: + + - name: Install dependencies (<3.12) + if: matrix.python-version == '3.12.0-alpha.4' run: | python3 -m pip install -U -r dev-requirements.txt From 0a0d02f0258a53934beb4bc9b926ccb944fd549b Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 1 Jun 2023 12:59:51 +0300 Subject: [PATCH 3/6] Fix comparisons --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b038da..09fb3e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: requirements.txt - name: Install dependencies (3.12) - if: matrix.python-version != '3.12.0-alpha.4' + if: matrix.python-version == '3.12.0-alpha.4' run: | # TODO remove when 3.12.0-alpha.4 pin removed. # Need to install coverage.py from source because its @@ -38,7 +38,7 @@ jobs: python3 -m pip install -U -r dev-requirements.txt --no-binary :all: - name: Install dependencies (<3.12) - if: matrix.python-version == '3.12.0-alpha.4' + if: matrix.python-version != '3.12.0-alpha.4' run: | python3 -m pip install -U -r dev-requirements.txt From fee0754363bc6bcf2873a458b63769c09b4a8ce2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 1 Jun 2023 14:48:04 +0300 Subject: [PATCH 4/6] Revert "Fix comparisons" This reverts commit 0a0d02f0258a53934beb4bc9b926ccb944fd549b. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09fb3e1..3b038da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: requirements.txt - name: Install dependencies (3.12) - if: matrix.python-version == '3.12.0-alpha.4' + if: matrix.python-version != '3.12.0-alpha.4' run: | # TODO remove when 3.12.0-alpha.4 pin removed. # Need to install coverage.py from source because its @@ -38,7 +38,7 @@ jobs: python3 -m pip install -U -r dev-requirements.txt --no-binary :all: - name: Install dependencies (<3.12) - if: matrix.python-version != '3.12.0-alpha.4' + if: matrix.python-version == '3.12.0-alpha.4' run: | python3 -m pip install -U -r dev-requirements.txt From 85ae7ac7976b39eb3772a14f61fca6f142c6ff6e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 1 Jun 2023 14:48:13 +0300 Subject: [PATCH 5/6] Revert "Install dependencies from source for 3.12 alpha 4" This reverts commit 857434c9cee0f7366ea516a39f66e9fce957dee9. --- .github/workflows/ci.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b038da..c08a86a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,16 +29,7 @@ jobs: dev-requirements.txt requirements.txt - - name: Install dependencies (3.12) - if: matrix.python-version != '3.12.0-alpha.4' - run: | - # TODO remove when 3.12.0-alpha.4 pin removed. - # Need to install coverage.py from source because its - # wheel is built for the beta and ABI-incompatible. - python3 -m pip install -U -r dev-requirements.txt --no-binary :all: - - - name: Install dependencies (<3.12) - if: matrix.python-version == '3.12.0-alpha.4' + - name: Install dependencies run: | python3 -m pip install -U -r dev-requirements.txt From 1633ed10fb20188028e9cbe6177d4019e8b81356 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 1 Jun 2023 14:51:04 +0300 Subject: [PATCH 6/6] Pin coverage==7.2.6 while testing Python 3.12 alpha 4 To avoid installing an ABI-incompatible wheel built against a beta --- dev-requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 7eb547a..1fb596f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,7 @@ -r requirements.txt -coverage==7.2.7 +# TODO Pin coverage==7.2.6 while testing Python 3.12 alpha 4, +# to avoid installing an ABI-incompatible wheel built against a beta. +coverage==7.2.6 pytest==7.3.1 pytest-aiohttp==1.0.4 pytest-mock==3.10.0