Speed up PyPy CI tests

Backport of: #13724

Author: Viicos

.github/workflows/ci.yml

@@ -677,13 +677,20 @@ jobs:
       - run: mkdir coverage
 
       - name: Run pytest
+        if: '!startsWith(matrix.python-version, ''pypy'')'
         run: make test NUM_THREADS=${{ endsWith(matrix.python-version, 't') && '4' || '1' }}
         env:
           COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
           CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}-without-deps
 
+      # Coverage is very slow on PyPy and it covers roughly the same lines as CPython tests:
+      - name: Run pytest (no coverage)
+        if: startsWith(matrix.python-version, 'pypy')
+        run: uv run pytest --durations=10
+
       - name: Store coverage files
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        if: '!startsWith(matrix.python-version, ''pypy'')'
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: coverage-${{ matrix.os }}-${{ matrix.python-version }}
           path: coverage

pydantic-core/tests/test_garbage_collection.py

@@ -21,9 +21,7 @@
 )
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898'
-)
+@pytest.mark.skipif(platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898')
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 def test_gc_schema_serializer() -> None:
     """https://github.com/pydantic/pydantic/issues/5136"""
@@ -50,9 +48,7 @@ class MyModel(BaseModel):
     assert_gc(lambda: len(cache) == 0)
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898'
-)
+@pytest.mark.skipif(platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898')
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 def test_gc_schema_validator() -> None:
     """https://github.com/pydantic/pydantic/issues/5136"""
@@ -80,9 +76,7 @@ class MyModel(BaseModel):
     assert_gc(lambda: len(cache) == 0)
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898'
-)
+@pytest.mark.skipif(platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898')
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 def test_gc_validator_iterator() -> None:
     """https://github.com/pydantic/pydantic/issues/9243"""
@@ -117,9 +111,7 @@ def __next__(self):
     assert_gc(lambda: len(cache) == 0)
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898'
-)
+@pytest.mark.skipif(platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898')
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 def test_gc_enum_serializer_class() -> None:
     """https://github.com/pydantic/pydantic/issues/13621"""
@@ -143,9 +135,7 @@ class MyEnum(EnumBase, str, Enum):
     assert_gc(lambda: len(cache) == 0)
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898'
-)
+@pytest.mark.skipif(platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898')
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 def test_gc_enum_validator_lookup() -> None:
     """https://github.com/pydantic/pydantic/issues/13621"""
@@ -169,9 +159,7 @@ class MyEnum(EnumBase, str, Enum):
     assert_gc(lambda: len(cache) == 0)
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898'
-)
+@pytest.mark.skipif(platform.python_implementation() == 'PyPy', reason='https://github.com/pypy/pypy/issues/3898')
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 def test_gc_field_exclude_if() -> None:
     """https://github.com/pydantic/pydantic/issues/13621"""

pydantic-core/tests/validators/test_dataclasses.py

@@ -1550,8 +1550,8 @@ def test_dataclass_wrap_json():
     assert v.validate_json('{"a": "hello", "b": true}', strict=True) == FooDataclass(a='hello', b=True)
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
+@pytest.mark.skipif(
+    platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
 )
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 @pytest.mark.parametrize('validator', [None, 'field', 'dataclass'])

pydantic-core/tests/validators/test_model_init.py

@@ -411,8 +411,8 @@ def __init__(self, **kwargs):
     assert calls == ["{'a': '1'}", "{'a': '1', 'x': 4}"]
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
+@pytest.mark.skipif(
+    platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
 )
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 @pytest.mark.parametrize('validator', [None, 'field', 'model'])

pydantic-core/tests/validators/test_nullable.py

@@ -39,8 +39,8 @@ def test_union_nullable_bool_int():
     assert v.validate_python(1) == 1
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
+@pytest.mark.skipif(
+    platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
 )
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 def test_leak_nullable():

pydantic-core/tests/validators/test_typed_dict.py

@@ -1208,8 +1208,8 @@ def test_extra_behavior_ignore(
     assert m == {'f': 'x'}
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
+@pytest.mark.skipif(
+    platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
 )
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 def test_leak_typed_dict():

pydantic-core/tests/validators/test_with_default.py

@@ -646,8 +646,8 @@ def val_func(v: Any, handler: core_schema.ValidatorFunctionWrapHandler) -> Any:
         validator.validate_python('')
 
 
-@pytest.mark.xfail(
-    condition=platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
+@pytest.mark.skipif(
+    platform.python_implementation() == 'PyPy', reason='https://foss.heptapod.net/pypy/pypy/-/issues/3899'
 )
 @pytest.mark.skipif(platform.python_implementation() == 'GraalVM', reason='Cannot reliably trigger GC on GraalPy')
 def test_leak_with_default():