From 4eec01bf6559b875d688b74b7e1e64117482a446 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 16 Oct 2023 13:07:22 +0200 Subject: [PATCH 1/3] GitHub Actions: Test both pypy3.9 and pypy3.10 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a505ba4e..fd7e5e2a 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, pypy3.10] steps: - uses: actions/checkout@v4 From 9d35e8eed581561526ad4999805ac24439eea983 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 16 Oct 2023 13:23:11 +0200 Subject: [PATCH 2/3] test_testresult.py: Two spaces less --- testtools/tests/test_testresult.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py index d419f02c..00abb599 100644 --- a/testtools/tests/test_testresult.py +++ b/testtools/tests/test_testresult.py @@ -2668,7 +2668,7 @@ 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 = ' ' + spaces = ' ' marker = '^' elif sys.version_info >= (3, 10): spaces = ' ' From afcd5afc4fc6c5b58ff6242330254ebde066d24d Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 16 Oct 2023 13:37:21 +0200 Subject: [PATCH 3/3] marker = '^^^' if sys.version_info >= (3, 10) else '^' --- testtools/tests/test_testresult.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py index 00abb599..015972cc 100644 --- a/testtools/tests/test_testresult.py +++ b/testtools/tests/test_testresult.py @@ -2669,13 +2669,11 @@ def test_syntax_error(self): """Syntax errors should still have fancy special-case formatting""" if platform.python_implementation() == "PyPy": spaces = ' ' - marker = '^' 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'