From 9eee45a7479cf5fa23b79057708a994a3b8d0eee Mon Sep 17 00:00:00 2001 From: SOUBHIK KUMAR MITRA Date: Mon, 1 Jul 2024 22:37:58 +0530 Subject: [PATCH 1/3] Bump PyPy runtime to v3.9 @ GHA PyPy 3.8 has a flaky bug in the garbage collector that is not going to be fixed there since that version is EoL, but newer versions have it addressed. The problem manifests itself in CI as follows: ```console TypeError: expected some sort of stmt, but got <_ast.Load object ...> ``` This patch makes use of the PyPy version that is still supported and contains a fix for the said bug. Ref: https://www.pypy.org/posts/2024/03/fixing-bug-incremental-gc.html Resolves #11771. --- .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 d78e0900fd9..9158d6bcc72 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -150,7 +150,7 @@ jobs: tox_env: "py313" use_coverage: true - name: "ubuntu-pypy3" - python: "pypy-3.8" + python: "pypy-3.9" os: ubuntu-latest tox_env: "pypy3-xdist" From d42b76daadb88d993ee74753766e22711a27395f Mon Sep 17 00:00:00 2001 From: SOUBHIK KUMAR MITRA Date: Fri, 19 Jul 2024 17:26:46 +0530 Subject: [PATCH 2/3] Adjust test_errors_in_xfail_skip_expressions for PyPy It appears that newer PyPy versions have a different syntax error marker offset. This patch stripps 7 whitespaces off of the marker line. --- testing/test_skipping.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/test_skipping.py b/testing/test_skipping.py index 558e3d35c6a..d1a63b1d920 100644 --- a/testing/test_skipping.py +++ b/testing/test_skipping.py @@ -1140,8 +1140,8 @@ def test_func(): result = pytester.runpytest() markline = " ^" pypy_version_info = getattr(sys, "pypy_version_info", None) - if pypy_version_info is not None and pypy_version_info < (6,): - markline = markline[1:] + if pypy_version_info is not None: + markline = markline[7:] if sys.version_info >= (3, 10): expected = [ From ced7072bb4f7653ad2f1d0d33639d87e7bc5f358 Mon Sep 17 00:00:00 2001 From: SOUBHIK KUMAR MITRA Date: Thu, 4 Jul 2024 15:01:34 +0530 Subject: [PATCH 3/3] Add a change note for PR #11771 Co-authored-by: Sviatoslav Sydorenko --- changelog/11771.contrib.rst | 5 +++++ changelog/12557.contrib.rst | 1 + 2 files changed, 6 insertions(+) create mode 100644 changelog/11771.contrib.rst create mode 120000 changelog/12557.contrib.rst diff --git a/changelog/11771.contrib.rst b/changelog/11771.contrib.rst new file mode 100644 index 00000000000..a3c1ed1099e --- /dev/null +++ b/changelog/11771.contrib.rst @@ -0,0 +1,5 @@ +The PyPy runtime version has been updated to 3.9 from 3.8 that introduced +a flaky bug at the garbage collector which was not expected to fix there +as the V3.8 is EoL. + +-- by :user:`x612skm` diff --git a/changelog/12557.contrib.rst b/changelog/12557.contrib.rst new file mode 120000 index 00000000000..c036c519093 --- /dev/null +++ b/changelog/12557.contrib.rst @@ -0,0 +1 @@ +11771.contrib.rst \ No newline at end of file