Check coverage by default only with latest Python

Author: Cito

.github/workflows/lint.yml

@@ -9,10 +9,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Python 3.10
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install dependencies
       run: |

.github/workflows/publish.yml

@@ -12,10 +12,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Python 3.10
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Build wheel and source tarball
       run: |

tests/language/test_block_string_fuzz.py

@@ -6,7 +6,7 @@
     print_block_string,
 )
 
-from ..utils import dedent, gen_fuzz_strings, timeout_factor
+from ..utils import dedent, gen_fuzz_strings
 
 
 def lex_value(s: str) -> str:
@@ -42,7 +42,7 @@ def assert_non_printable_block_string(test_value: str) -> None:
 
 def describe_print_block_string():
     @mark.slow
-    @mark.timeout(80 * timeout_factor)
+    @mark.timeout(80)
     def correctly_print_random_strings():
         # Testing with length >7 is taking exponentially more time. However, it is
         # highly recommended testing with increased limit if you make any change.

tests/utilities/test_build_ast_schema.py

@@ -39,7 +39,7 @@
 
 from ..fixtures import big_schema_sdl  # noqa: F401
 from ..star_wars_schema import star_wars_schema
-from ..utils import dedent, timeout_factor
+from ..utils import dedent
 
 
 try:
@@ -1228,7 +1228,7 @@ def can_deep_copy_pickled_schema():
 
     @mark.slow
     def describe_deepcopy_and_pickle_big():  # pragma: no cover
-        @mark.timeout(20 * timeout_factor)
+        @mark.timeout(20)
         def can_deep_copy_big_schema(big_schema_sdl):  # noqa: F811
             # use our printing conventions
             big_schema_sdl = cycle_sdl(big_schema_sdl)
@@ -1240,7 +1240,7 @@ def can_deep_copy_big_schema(big_schema_sdl):  # noqa: F811
             # check that printing the copied schema gives the same SDL
             assert print_schema(copied) == big_schema_sdl
 
-        @mark.timeout(60 * timeout_factor)
+        @mark.timeout(60)
         def can_pickle_and_unpickle_big_schema(big_schema_sdl):  # noqa: F811
             # use our printing conventions
             big_schema_sdl = cycle_sdl(big_schema_sdl)
@@ -1272,7 +1272,7 @@ def can_pickle_and_unpickle_big_schema(big_schema_sdl):  # noqa: F811
             finally:
                 sys.setrecursionlimit(limit)
 
-        @mark.timeout(60 * timeout_factor)
+        @mark.timeout(60)
         def can_deep_copy_pickled_big_schema(big_schema_sdl):  # noqa: F811
             # use our printing conventions
             big_schema_sdl = cycle_sdl(big_schema_sdl)

tests/utilities/test_introspection_from_schema.py

@@ -14,7 +14,7 @@
 )
 
 from ..fixtures import big_schema_introspection_result, big_schema_sdl  # noqa: F401
-from ..utils import dedent, timeout_factor
+from ..utils import dedent
 
 
 def introspection_to_sdl(introspection: IntrospectionQuery) -> str:
@@ -108,7 +108,7 @@ def can_deep_copy_pickled_schema():
 
     @mark.slow
     def describe_deepcopy_and_pickle_big():  # pragma: no cover
-        @mark.timeout(20 * timeout_factor)
+        @mark.timeout(20)
         def can_deep_copy_big_schema(big_schema_sdl):  # noqa: F811
             # introspect the original big schema
             big_schema = build_schema(big_schema_sdl)
@@ -119,7 +119,7 @@ def can_deep_copy_big_schema(big_schema_sdl):  # noqa: F811
             # check that introspecting the copied schema gives the same result
             assert introspection_from_schema(copied) == expected_introspection
 
-        @mark.timeout(60 * timeout_factor)
+        @mark.timeout(60)
         def can_pickle_and_unpickle_big_schema(big_schema_sdl):  # noqa: F811
             # introspect the original big schema
             big_schema = build_schema(big_schema_sdl)
@@ -153,7 +153,7 @@ def can_pickle_and_unpickle_big_schema(big_schema_sdl):  # noqa: F811
             finally:
                 sys.setrecursionlimit(limit)
 
-        @mark.timeout(60 * timeout_factor)
+        @mark.timeout(60)
         def can_deep_copy_pickled_big_schema(big_schema_sdl):  # noqa: F811
             # introspect the original big schema
             big_schema = build_schema(big_schema_sdl)

tests/utilities/test_strip_ignored_characters_fuzz.py

@@ -7,7 +7,7 @@
 from graphql.language import Lexer, Source, TokenKind
 from graphql.utilities import strip_ignored_characters
 
-from ..utils import dedent, gen_fuzz_strings, timeout_factor
+from ..utils import dedent, gen_fuzz_strings
 
 
 ignored_tokens = [
@@ -228,7 +228,7 @@ def does_not_strip_random_ignored_tokens_embedded_in_the_block_string():
         ).to_stay_the_same()
 
     @mark.slow
-    @mark.timeout(80 * timeout_factor)
+    @mark.timeout(80)
     def strips_ignored_characters_inside_random_block_strings():
         # Testing with length >7 is taking exponentially more time. However it is
         # highly recommended to test with increased limit if you make any change.

tests/utils/__init__.py

@@ -1,13 +1,7 @@
 """Test utilities"""
 
-from platform import python_implementation
-
 from .dedent import dedent
 from .gen_fuzz_strings import gen_fuzz_strings
 
 
-# some tests can take much longer on PyPy
-timeout_factor = 4 if python_implementation() == "PyPy" else 1
-
-
-__all__ = ["dedent", "gen_fuzz_strings", "timeout_factor"]
+__all__ = ["dedent", "gen_fuzz_strings"]

tox.ini

@@ -14,13 +14,13 @@ python =
     pypy3.9: pypy39
 
 [testenv:black]
-basepython = python3.10
+basepython = python3.11
 deps = black==23.1.0
 commands  =
     black src tests -t py310 --check
 
 [testenv:flake8]
-basepython = python3.10
+basepython = python3.11
 deps =
     flake8>=6,<7
     flake8-bandit>=4.1,<5
@@ -29,21 +29,21 @@ commands =
     flake8 src tests
 
 [testenv:isort]
-basepython = python3.10
+basepython = python3.11
 deps = isort>=5.12,<6
 commands =
     isort src tests --check-only
 
 [testenv:mypy]
-basepython = python3.10
+basepython = python3.11
 deps =
     mypy==1.0.0
     pytest>=7.2,<8
 commands =
     mypy src tests
 
 [testenv:docs]
-basepython = python3.10
+basepython = python3.11
 deps =
     sphinx>=5.3,<6
     sphinx_rtd_theme>=1.1,<2
@@ -62,4 +62,5 @@ deps =
 commands =
     # to also run the time-consuming tests: tox -e py310 -- --run-slow
     # to run the benchmarks: tox -e py310 -- -k benchmarks --benchmark-enable
-    pytest tests {posargs: --cov-report=term-missing --cov=graphql --cov=tests --cov-fail-under=100}
+    py37,py38.py39,py310,pypy39: pytest tests {posargs}
+    py311: pytest tests {posargs: --cov-report=term-missing --cov=graphql --cov=tests --cov-fail-under=100}