Merge pull request #412 from gforcada/patch-1

Update supported Python versions, add 3.11, 3.12, PyPy 3.9 and PyPy 3.10 and remove 3.7
Pylons · Feb 4, 2024 · f19cc71 · f19cc71
2 parents f737755 + af0fd3d
commit f19cc71
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -15,13 +15,15 @@ jobs:
         strategy:
             matrix:
                 py:
-                    - "3.7"
                     - "3.8"
                     - "3.9"
                     - "3.10"
+                    - "3.11"
+                    - "3.12"
                     - "pypy-3.8"
+                    - "pypy-3.9"
+                    - "pypy-3.10"
                     # Pre-release
-                    - "3.11.0-alpha - 3.11.0"
                 os:
                     - "ubuntu-latest"
                     - "windows-latest"
@@ -32,12 +34,26 @@ 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"
                       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 }}

diff --git 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):

diff --git 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
@@ -11,6 +11,8 @@ commands =
     python --version
     python -mpytest \
     pypy38: --no-cov \
+    pypy39: --no-cov \
+    pypy310: --no-cov \
         {posargs:}
 extras =
     testing