Test with CPython 3.10-dev

Author: Zac-HD

.github/workflows/main.yml

@@ -24,6 +24,7 @@ jobs:
           - check-pypy37
           - check-py38
           - check-py39
+          - check-py310
           - check-quality
           - lint-ruby
           - check-ruby-tests

hypothesis-python/scripts/basic-test.sh

@@ -44,7 +44,7 @@ pip install lark-parser==0.7.1
 $PYTEST tests/lark/
 pip uninstall -y lark-parser
 
-if [ "$(python -c 'import platform; print(platform.python_implementation() != "PyPy")')" = "True" ] ; then
+if [ "$(python -c $'import platform, sys; print(sys.version_info.releaselevel == \'final\' and platform.python_implementation() != "PyPy")')" = "True" ] ; then
   pip install ".[codemods,cli]"
   $PYTEST tests/codemods/
   pip uninstall -y libcst click

hypothesis-python/tests/cover/test_annotations.py

@@ -13,6 +13,7 @@
 #
 # END HEADER
 
+import sys
 from inspect import getfullargspec
 
 import attr
@@ -115,7 +116,8 @@ def test_composite_edits_annotations():
 @pytest.mark.parametrize("nargs", [1, 2, 3])
 def test_given_edits_annotations(nargs):
     spec_given = getfullargspec(given(*(nargs * [st.none()]))(pointless_composite))
-    assert spec_given.annotations.pop("return") is None
+    expected = None if sys.version_info[:2] < (3, 10) else type(None)
+    assert spec_given.annotations.pop("return") == expected
     assert len(spec_given.annotations) == 3 - nargs
 
 

hypothesis-python/tests/cover/test_lookup.py

@@ -337,15 +337,16 @@ def test_distinct_typevars_distinct_type():
     )
 
 
-@given(st.data())
-def test_same_typevars_same_type(data):
-    """Ensures that single type argument will always have the same type in a single context."""
-    A = typing.TypeVar("A")
+A = typing.TypeVar("A")
 
-    def same_type_args(a: A, b: A):
-        assert type(a) == type(b)
 
-    data.draw(st.builds(same_type_args))
+def same_type_args(a: A, b: A):
+    assert type(a) == type(b)
+
+
+@given(st.builds(same_type_args))
+def test_same_typevars_same_type(_):
+    """Ensures that single type argument will always have the same type in a single context."""
 
 
 def test_typevars_can_be_redefined():
@@ -755,7 +756,12 @@ def test_compat_get_type_hints_aware_of_None_default():
     find_any(strategy, lambda x: x.a is not None)
 
     assert typing.get_type_hints(constructor)["a"] == typing.Optional[str]
-    assert inspect.signature(constructor).parameters["a"].annotation == str
+    annotation = inspect.signature(constructor).parameters["a"].annotation
+    assert annotation == str or (
+        # See https://bugs.python.org/issue43006
+        annotation == typing.Optional[str]
+        and sys.version_info[:2] >= (3, 10)
+    )
 
 
 _ValueType = typing.TypeVar("_ValueType")

hypothesis-python/tests/cover/test_lookup_py38.py

@@ -14,6 +14,7 @@
 # END HEADER
 
 import dataclasses
+import sys
 import typing
 
 import pytest
@@ -98,6 +99,18 @@ def test_typeddict_with_optional_then_required_again(value):
     assert isinstance(value["c"], str)
 
 
+class NestedDict(typing.TypedDict):
+    inner: A
+
+
+@pytest.mark.skipif(sys.version_info[:2] >= (3, 10), reason="see issue #2897")
+@given(from_type(NestedDict))
+def test_typeddict_with_nested_value(value):
+    assert type(value) == dict
+    assert set(value) == {"inner"}
+    assert isinstance(value["inner"]["a"], int)
+
+
 @pytest.mark.xfail
 def test_layered_optional_key_is_optional():
     # Optional keys are not currently supported, as PEP-589 leaves no traces

hypothesis-python/tests/cover/test_randoms.py

@@ -15,6 +15,7 @@
 
 import inspect
 import math
+import sys
 from copy import copy
 
 import pytest
@@ -97,7 +98,7 @@ def any_call_of_method(draw, method):
         b = draw(INT64)
         assume(a != b)
         a, b = sorted((a, b))
-        if a == 0 and draw(st.booleans()):
+        if a == 0 and sys.version_info[:2] < (3, 10) and draw(st.booleans()):
             start = b
             stop = None
         else:

hypothesis-python/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,py36,37,py37,38,39}-{brief,prettyquick,full,custom}
+envlist = py{36,py36,37,py37,38,39,310}-{brief,prettyquick,full,custom}
 toxworkdir={env:TOX_WORK_DIR:.tox}
 
 [testenv]

tooling/src/hypothesistooling/__main__.py

@@ -312,14 +312,15 @@ def run_tox(task, version):
 PY37 = "3.7.10"
 PY38 = PYMAIN = "3.8.8"  # Note: keep this in sync with build.sh and GH Actions main.yml
 PY39 = "3.9.2"
+PY310 = "3.10-dev"
 PYPY36 = "pypy3.6-7.3.1"
 PYPY37 = "pypy3.7-7.3.2"
 
 
 # ALIASES are the executable names for each Python version
 ALIASES = {PYPY36: "pypy3", PYPY37: "pypy3"}
 
-for n in [PY36, PY37, PY38, PY39]:
+for n in [PY36, PY37, PY38, PY39, PY310]:
     major, minor, patch = n.replace("-dev", ".").split(".")
     ALIASES[n] = f"python{major}.{minor}"
 
@@ -353,6 +354,11 @@ def check_py39():
     run_tox("py39-full", PY39)
 
 
+@python_tests
+def check_py310():
+    run_tox("py310-full", PY310)
+
+
 @python_tests
 def check_pypy36():
     run_tox("pypy3-full", PYPY36)