Merge pull request #12557 from x612skm/maintainence/11771-pypy-3.9-bump

(cherry picked from commit a7d5a8e)
pytest-dev · Jul 19, 2024 · 0cec1d9 · 0cec1d9
1 parent 18ca7c2
commit 0cec1d9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -145,7 +145,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"
 

diff --git a/changelog/11771.contrib.rst 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
@@ -0,0 +1 @@
+11771.contrib.rst
diff --git a/testing/test_skipping.py b/testing/test_skipping.py
@@ -1145,8 +1145,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 = [