more fixes

Author: Zac-HD

whole_repo_tests/revealed_types.py

@@ -8,6 +8,24 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
+REVEALED_TYPES = [
+    ("integers()", "int"),
+    ("text()", "str"),
+    ("integers().map(str)", "str"),
+    ("booleans().filter(bool)", "bool"),
+    ("tuples()", "Tuple[()]"),
+    ("tuples(integers())", "Tuple[int]"),
+    ("tuples(integers(), text())", "Tuple[int, str]"),
+    (
+        "tuples(integers(), text(), integers(), text(), integers())",
+        "Tuple[int, str, int, str, int]",
+    ),
+    (
+        "tuples(text(), text(), text(), text(), text(), text())",
+        "Tuple[Any, ...]",
+    ),
+]
+
 NUMPY_REVEALED_TYPES = [
     (
         'arrays(dtype=np.dtype("int32"), shape=1)',

whole_repo_tests/test_mypy.py

@@ -16,7 +16,7 @@
 from hypothesistooling.projects.hypothesispython import PYTHON_SRC
 from hypothesistooling.scripts import pip_tool, tool_path
 
-from .revealed_types import NUMPY_REVEALED_TYPES
+from .revealed_types import NUMPY_REVEALED_TYPES, REVEALED_TYPES
 
 PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11"]
 
@@ -99,12 +99,8 @@ def convert_lines():
 @pytest.mark.parametrize(
     "val,expect",
     [
-        ("integers()", "int"),
-        ("text()", "str"),
-        ("integers().map(str)", "str"),
-        ("booleans().filter(bool)", "bool"),
+        *REVEALED_TYPES,  # shared with Pyright
         ("lists(none())", "list[None]"),
-        ("dictionaries(integers(), datetimes())", "dict[int, datetime.datetime]"),
         ("data()", "hypothesis.strategies._internal.core.DataObject"),
         ("none() | integers()", "Union[None, int]"),
         ("recursive(integers(), lists)", "Union[list[Any], int]"),
@@ -119,17 +115,6 @@ def convert_lines():
             "one_of(integers(), text(), none(), binary(), builds(list), builds(dict))",
             "Any",
         ),
-        ("tuples()", "tuple[()]"),
-        ("tuples(integers())", "tuple[int]"),
-        ("tuples(integers(), text())", "tuple[int, str]"),
-        (
-            "tuples(integers(), text(), integers(), text(), integers())",
-            "tuple[int, str, int, str, int]",
-        ),
-        (
-            "tuples(text(), text(), text(), text(), text(), text())",
-            "tuple[Any, ...]",
-        ),
         # Note: keep this in sync with the equivalent test for Pyright
     ],
 )

whole_repo_tests/test_pyright.py

@@ -23,7 +23,7 @@
 from hypothesistooling.projects.hypothesispython import HYPOTHESIS_PYTHON, PYTHON_SRC
 from hypothesistooling.scripts import pip_tool, tool_path
 
-from .revealed_types import NUMPY_REVEALED_TYPES
+from .revealed_types import NUMPY_REVEALED_TYPES, REVEALED_TYPES
 
 PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
@@ -178,10 +178,7 @@ def test_numpy_arrays_strategy(tmp_path: Path):
 @pytest.mark.parametrize(
     "val,expect",
     [
-        ("integers()", "int"),
-        ("text()", "str"),
-        ("integers().map(str)", "str"),
-        ("booleans().filter(bool)", "bool"),
+        *REVEALED_TYPES,  # shared with Mypy
         ("lists(none())", "List[None]"),
         ("dictionaries(integers(), datetimes())", "Dict[int, datetime]"),
         ("data()", "DataObject"),
@@ -198,17 +195,6 @@ def test_numpy_arrays_strategy(tmp_path: Path):
             "one_of(integers(), text(), none(), binary(), builds(list), builds(dict))",
             "Any",
         ),
-        ("tuples()", "Tuple[()]"),
-        ("tuples(integers())", "Tuple[int]"),
-        ("tuples(integers(), text())", "Tuple[int, str]"),
-        (
-            "tuples(integers(), text(), integers(), text(), integers())",
-            "Tuple[int, str, int, str, int]",
-        ),
-        (
-            "tuples(text(), text(), text(), text(), text(), text())",
-            "Tuple[Any, ...]",
-        ),
         # Note: keep this in sync with the equivalent test for Mypy
     ],
 )