From b0f9a2ff0de961c97dfc787d139c19e39ddd5587 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Sun, 14 May 2023 19:11:28 +0200 Subject: [PATCH 1/7] Test on more python versions - cpython 3.11 and 3.12 - pypy 3.9 and 3.10 --- .github/workflows/ci-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 5ce5cb5a..cfe4cb88 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -19,9 +19,11 @@ jobs: - "3.8" - "3.9" - "3.10" - - "pypy-3.8" + - "3.11" + - "3.12" + - "pypy-3.9" + - "pypy-3.10" # Pre-release - - "3.11.0-alpha - 3.11.0" os: - "ubuntu-latest" - "windows-latest" From 9c5aefe26fc77a5965e4ac71953680f10c0a5043 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Mon, 12 Jun 2023 07:27:18 +0200 Subject: [PATCH 2/7] Keep pypy-3.8 --- .github/workflows/ci-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index cfe4cb88..1d06a0da 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -21,6 +21,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "pypy-3.8" - "pypy-3.9" - "pypy-3.10" # Pre-release From 7f6b2a6fc13d9dc615f1a1ac5b47a7c212d2d928 Mon Sep 17 00:00:00 2001 From: Delta Regeer Date: Sun, 4 Feb 2024 14:16:47 -0700 Subject: [PATCH 3/7] Update the Python versions we support --- .github/workflows/ci-tests.yml | 1 - tox.ini | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 1d06a0da..11fb39f7 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -15,7 +15,6 @@ jobs: strategy: matrix: py: - - "3.7" - "3.8" - "3.9" - "3.10" diff --git a/tox.ini b/tox.ini index a0cc6854..6f0d4ac0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = lint, - py37,py38,py39,py310,pypy38, + py38,py39,py310,py311,py312,pypy38,pypy39,pypy310 coverage, docs isolated_build = True From 494ab7c3c3568d1d140a66d9c2584bffb8e7806c Mon Sep 17 00:00:00 2001 From: Delta Regeer Date: Sun, 4 Feb 2024 14:32:49 -0700 Subject: [PATCH 4/7] os.path.exists.__name__ has changed on Windows in Python 3.12 --- tests/test_runner.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_runner.py b/tests/test_runner.py index 4cf6f6fd..d126fd7e 100644 --- a/tests/test_runner.py +++ b/tests/test_runner.py @@ -57,7 +57,9 @@ def test_simple_happy_path(self): def test_complex_happy_path(self): # Ensure we can recursively resolve object attributes if necessary. - self.assertEqual(runner.resolve("os.path", "exists.__name__"), "exists") + from os.path import exists + + self.assertEqual(runner.resolve("os.path", "exists.__name__"), exists.__name__) class Test_run(unittest.TestCase): From b83c312435070db4b04c36418255eb57d9588ddf Mon Sep 17 00:00:00 2001 From: Delta Regeer Date: Sun, 4 Feb 2024 14:57:04 -0700 Subject: [PATCH 5/7] Don't run coverage on PyPy3.{9,10} --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 6f0d4ac0..9a60fdbc 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,8 @@ commands = python --version python -mpytest \ pypy38: --no-cov \ + pypy39: --no-cov \ + pypy310: --no-cov \ {posargs:} extras = testing From 6c8bb63f6f659ed1d198b763ef75c10a0db2e08d Mon Sep 17 00:00:00 2001 From: Delta Regeer Date: Sun, 4 Feb 2024 15:08:35 -0700 Subject: [PATCH 6/7] Set specific toxenv for PyPy Required so that additional command line args are added to the pytest run --- .github/workflows/ci-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 11fb39f7..d2b02c10 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -34,6 +34,10 @@ jobs: include: - py: "pypy-3.8" toxenv: "pypy38" + - py: "pypy-3.9" + toxenv: "pypy39" + - py: "pypy-3.10" + toxenv: "pypy310" exclude: # Linux and macOS don't have x86 python - os: "ubuntu-latest" From af0fd3ded212bc7db0bc9a7ef7adae03fea8e386 Mon Sep 17 00:00:00 2001 From: Delta Regeer Date: Sun, 4 Feb 2024 15:08:59 -0700 Subject: [PATCH 7/7] Don't run all PyPy version for macOS/Windows --- .github/workflows/ci-tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index d2b02c10..57ce52cc 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -44,6 +44,16 @@ jobs: architecture: x86 - os: "macos-latest" architecture: x86 + # Don't run all PyPy versions except latest on + # Windows/macOS. They are expensive to run. + - os: "windows-latest" + py: "pypy-3.8" + - os: "macos-latest" + py: "pypy-3.8" + - os: "windows-latest" + py: "pypy-3.9" + - os: "macos-latest" + py: "pypy-3.9" name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}" runs-on: ${{ matrix.os }}