From 5a5e806c0a4df2a7761bb31ad2ef11552f109fa2 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 16 Oct 2023 12:58:55 +0200 Subject: [PATCH 1/2] setup.cfg: Add Programming Language :: Python :: 3.12 --- .github/workflows/test.yml | 2 +- setup.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a505ba4e..576054d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9, "3.10", 3.11, 3.12, pypy3.10] + python-version: [3.6, 3.7, 3.8, 3.9, "3.10", 3.11, 3.12, pypy3.9] steps: - uses: actions/checkout@v4 diff --git a/setup.cfg b/setup.cfg index b73fa3e1..9d4e9578 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,6 +18,7 @@ classifier = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: PyPy From 17845a45ed4287bc3b79b1569dd8655c9ace691e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 18 Oct 2023 07:53:25 +0200 Subject: [PATCH 2/2] Fix pypy tests in test_testresult.py --- .github/workflows/test.yml | 2 +- testtools/tests/test_testresult.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 576054d7..a505ba4e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9, "3.10", 3.11, 3.12, pypy3.9] + python-version: [3.6, 3.7, 3.8, 3.9, "3.10", 3.11, 3.12, pypy3.10] steps: - uses: actions/checkout@v4 diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py index d419f02c..015972cc 100644 --- a/testtools/tests/test_testresult.py +++ b/testtools/tests/test_testresult.py @@ -2668,14 +2668,12 @@ def test_non_ascii_dirname(self): def test_syntax_error(self): """Syntax errors should still have fancy special-case formatting""" if platform.python_implementation() == "PyPy": - spaces = ' ' - marker = '^' + spaces = ' ' elif sys.version_info >= (3, 10): spaces = ' ' - marker = '^^^' else: spaces = ' ' - marker = '^' + marker = '^^^' if sys.version_info >= (3, 10) else '^' textoutput = self._test_external_case("exec ('f(a, b c)')") self.assertIn(self._as_output( ' File "", line 1\n'