Manual fixes for py39

Author: Zac-HD

.github/workflows/main.yml

@@ -29,10 +29,6 @@ jobs:
           - check-format
           - check-coverage
           - check-conjecture-coverage
-          - check-py38-cover
-          - check-py38-nocover
-          - check-py38-niche
-          - check-pypy38-cover
           - check-py39-cover
           - check-pypy39-cover
           - check-py310-cover
@@ -91,7 +87,7 @@ jobs:
           # - check-crosshair-custom-pytest/test_*
           # - check-crosshair-nocover
           # - check-crosshair-niche
-          - check-py38-oldestnumpy
+          - check-py39-oldestnumpy
           - check-numpy-nightly
       fail-fast: false
     steps:
@@ -197,7 +193,6 @@ jobs:
     strategy:
       matrix:
         task:
-          - check-py38-cover
           - check-py310-cover
           - check-py310-nocover
           - check-py310-niche

CONTRIBUTING.rst

@@ -208,11 +208,11 @@ high level, the task takes the form:
 Namely, first provide the tox environment (see ``tox.ini``), then the python
 version to test with, then any ``tox`` or ``pytest`` args as needed. For
 example, to run all of the tests in the file
-``tests/nocover/test_conjecture_engine.py`` with python 3.8:
+``tests/nocover/test_conjecture_engine.py`` with python 3.12:
 
 .. code-block::
 
-    ./build.sh tox py38-custom 3.8.13 -- tests/nocover/test_conjecture_engine.py
+    ./build.sh tox py312-custom 3.12.7 -- tests/nocover/test_conjecture_engine.py
 
 See the ``tox`` docs and ``pytest`` docs for more information:
 * https://docs.pytest.org/en/latest/how-to/usage.html

hypothesis-python/RELEASE.rst

@@ -0,0 +1,4 @@
+RELEASE_TYPE: minor
+
+This release drops support for Python 3.8, `which reached end of life on
+2024-10-07 <https://devguide.python.org/versions/>`__.

hypothesis-python/docs/supported.rst

@@ -45,7 +45,7 @@ exactly where an error came from, or turn only our warnings into errors.
 Python versions
 ---------------
 
-Hypothesis is supported and tested on CPython 3.8+, i.e.
+Hypothesis is supported and tested on CPython 3.9+, i.e.
 `all versions of CPython with upstream support <https://devguide.python.org/versions/>`_,
 along with PyPy for the same versions.
 32-bit builds of CPython also work, though we only test them on Windows.

hypothesis-python/scripts/basic-test.sh

@@ -47,9 +47,9 @@ if [ "$(python -c $'import platform, sys; print(sys.version_info.releaselevel ==
   $PYTEST tests/codemods/
   pip uninstall -y libcst click
 
-  if [ "$(python -c 'import sys; print(sys.version_info[:2] == (3, 8))')" = "True" ] ; then
-    # Per NEP-29, this is the last version to support Python 3.8
-    pip install numpy==1.24.3
+  if [ "$(python -c 'import sys; print(sys.version_info[:2] == (3, 9))')" = "True" ] ; then
+    # Per NEP-29, this is the last version to support Python 3.9
+    pip install numpy==2.0.2
   else
     pip install "$(grep 'numpy==' ../requirements/coverage.txt)"
   fi

hypothesis-python/scripts/other-tests.sh

@@ -35,11 +35,9 @@ if [[ "$HYPOTHESIS_PROFILE" != "crosshair" ]]; then
   pip uninstall -y typing_extensions
 fi
 
-if [ "$(python -c 'import sys; print(sys.version_info[:2] >= (3, 9))')" = "True" ] ; then
-  pip install "$(grep 'annotated-types==' ../requirements/coverage.txt)"
-  $PYTEST tests/test_annotated_types.py
-  pip uninstall -y annotated-types
-fi
+pip install "$(grep 'annotated-types==' ../requirements/coverage.txt)"
+$PYTEST tests/test_annotated_types.py
+pip uninstall -y annotated-types
 
 pip install ".[lark]"
 pip install "$(grep -oE 'lark>=([0-9.]+)' ../hypothesis-python/setup.py | tr '>' =)"
@@ -52,17 +50,15 @@ if [ "$(python -c $'import platform, sys; print(sys.version_info.releaselevel ==
   pip install ".[codemods,cli]"
   $PYTEST tests/codemods/
 
-  if [ "$(python -c 'import sys; print(sys.version_info[:2] == (3, 8))')" = "True" ] ; then
-    # Per NEP-29, this is the last version to support Python 3.8
-    pip install numpy==1.24.3
+  if [ "$(python -c 'import sys; print(sys.version_info[:2] == (3, 9))')" = "True" ] ; then
+    # Per NEP-29, this is the last version to support Python 3.9
+    pip install numpy==2.0.2
   else
     pip install "$(grep 'numpy==' ../requirements/coverage.txt)"
   fi
 
   pip install "$(grep -E 'black(==| @)' ../requirements/coverage.txt)"
-  if [ "$(python -c 'import sys; print(sys.version_info[:2] >= (3, 9))')" = "True" ] ; then
-    $PYTEST tests/patching/
-  fi
+  $PYTEST tests/patching/
   pip uninstall -y libcst
 
   $PYTEST tests/ghostwriter/

hypothesis-python/setup.py

@@ -14,10 +14,10 @@
 
 import setuptools
 
-if sys.version_info[:2] < (3, 8):  # noqa  # "unreachable" sanity check
+if sys.version_info[:2] < (3, 9):  # "unreachable" sanity check
     raise Exception(
         "You are trying to install Hypothesis using Python "
-        f"{sys.version.split()[0]}, but it requires Python 3.8 or later."
+        f"{sys.version.split()[0]}, but it requires Python 3.9 or later."
         "Update `pip` and `setuptools`, try again, and you will automatically "
         "get the latest compatible version of Hypothesis instead.  "
         "See also https://python3statement.org/practicalities/"
@@ -55,17 +55,15 @@ def local_file(name):
     "pytz": ["pytz>=2014.1"],
     "dateutil": ["python-dateutil>=1.4"],
     "lark": ["lark>=0.10.1"],  # probably still works with old `lark-parser` too
-    "numpy": ["numpy>=1.17.3"],  # oldest with wheels for non-EOL Python (for now)
+    "numpy": ["numpy>=1.19.3"],  # oldest with wheels for non-EOL Python (for now)
     "pandas": ["pandas>=1.1"],
     "pytest": ["pytest>=4.6"],
     "dpcontracts": ["dpcontracts>=0.4"],
     "redis": ["redis>=3.0.0"],
     "crosshair": ["hypothesis-crosshair>=0.0.14", "crosshair-tool>=0.0.73"],
-    # zoneinfo is an odd one: every dependency is conditional, because they're
-    # only necessary on old versions of Python or Windows systems or emscripten.
+    # zoneinfo is an odd one: every dependency is platform-conditional.
     "zoneinfo": [
         "tzdata>=2024.2 ; sys_platform == 'win32' or sys_platform == 'emscripten'",
-        "backports.zoneinfo>=0.2.1 ; python_version<'3.9'",
     ],
     # We only support Django versions with upstream support - see
     # https://www.djangoproject.com/download/#supported-versions
@@ -101,7 +99,7 @@ def local_file(name):
         "exceptiongroup>=1.0.0 ; python_version<'3.11'",
         "sortedcontainers>=2.1.0,<3.0.0",
     ],
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Framework :: Hypothesis",
@@ -114,7 +112,6 @@ def local_file(name):
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",

hypothesis-python/src/hypothesis/core.py

@@ -209,7 +209,7 @@ def xfail(
             @example(...).xfail()
             @example(...).xfail(reason="Prices must be non-negative")
             @example(...).xfail(raises=(KeyError, ValueError))
-            @example(...).xfail(sys.version_info[:2] >= (3, 9), reason="needs py39+")
+            @example(...).xfail(sys.version_info[:2] >= (3, 12), reason="needs py 3.12")
             @example(...).xfail(condition=sys.platform != "linux", raises=OSError)
             def test(x):
                 pass
@@ -229,21 +229,6 @@ def test_fraction(x, y):
                     # strategy.  If we happen to generate y=0, the test will fail
                     # because only the explicit example is treated as xfailing.
                     x / y
-
-        Note that this "method chaining" syntax requires Python 3.9 or later, for
-        :pep:`614` relaxing grammar restrictions on decorators.  If you need to
-        support older versions of Python, you can use an identity function:
-
-        .. code-block:: python
-
-            def identity(x):
-                return x
-
-
-            @identity(example(...).xfail())
-            def test(x):
-                pass
-
         """
         check_type(bool, condition, "condition")
         check_type(str, reason, "reason")
@@ -284,21 +269,6 @@ def via(self, whence: str, /) -> "example":
             @example(...).via("hy-target-$label")
             def test(x):
                 pass
-
-        Note that this "method chaining" syntax requires Python 3.9 or later, for
-        :pep:`614` relaxing grammar restrictions on decorators.  If you need to
-        support older versions of Python, you can use an identity function:
-
-        .. code-block:: python
-
-            def identity(x):
-                return x
-
-
-            @identity(example(...).via("label"))
-            def test(x):
-                pass
-
         """
         if not isinstance(whence, str):
             raise InvalidArgument(".via() must be passed a string")
@@ -1359,7 +1329,7 @@ def _raise_to_user(
         for note in fragments:
             add_note(err, note)
             if note.startswith(failing_prefix):
-                ls.append(note[len(failing_prefix) :])
+                ls.append(note.removeprefix(failing_prefix))
     if current_pytest_item.value:
         current_pytest_item.value._hypothesis_failing_examples = ls
 

hypothesis-python/src/hypothesis/extra/_patching.py

@@ -112,8 +112,6 @@ def __call_node_to_example_dec(self, node, via):
                 else node.args
             ),
         )
-        # Note: calling a method on a decorator requires PEP-614, i.e. Python 3.9+,
-        # but plumbing two cases through doesn't seem worth the trouble :-/
         via = cst.Call(
             func=cst.Attribute(node, cst.Name("via")),
             args=[cst.Arg(cst.SimpleString(repr(via)))],

hypothesis-python/src/hypothesis/extra/ghostwriter.py

@@ -290,9 +290,8 @@ def _strategy_for(param: inspect.Parameter, docstring: str) -> st.SearchStrategy
         types = []
         for token in re.split(r",? +or +| *, *", doc_type):
             for prefix in ("default ", "python "):
-                # `str or None, default "auto"`; `python int or numpy.int64`
-                if token.startswith(prefix):
-                    token = token[len(prefix) :]
+                # e.g. `str or None, default "auto"` or `python int or numpy.int64`
+                token = token.removeprefix(prefix)
             if not token:
                 continue
             try:
@@ -636,8 +635,6 @@ def _imports_for_strategy(strategy):
             for imp in _imports_for_object(_strip_typevars(arg))
         }
         if re.match(r"from_(type|regex)\(", repr(strategy)):
-            if repr(strategy).startswith("from_type("):
-                return {module for module, _ in imports}
             return imports
         elif _get_module(strategy.function).startswith("hypothesis.extra."):
             module = _get_module(strategy.function).replace("._array_helpers", ".numpy")
@@ -1228,7 +1225,7 @@ def magic(
             for k in sorted(sys.modules, key=len):
                 if (
                     k.startswith(f"{thing.__name__}.")
-                    and "._" not in k[len(thing.__name__) :]
+                    and "._" not in k.removeprefix(thing.__name__)
                     and not k.startswith(tuple(f"{m}." for m in mods))
                     and _get_testable_functions(sys.modules[k])
                 ):

hypothesis-python/src/hypothesis/internal/compat.py

@@ -150,16 +150,14 @@ def get_type_hints(thing):
         )
         return {k: v for k, v in get_type_hints(thing.func).items() if k not in bound}
 
-    kwargs = {} if sys.version_info[:2] < (3, 9) else {"include_extras": True}
-
     try:
-        hints = typing.get_type_hints(thing, **kwargs)
+        hints = typing.get_type_hints(thing, include_extras=True)
     except (AttributeError, TypeError, NameError):  # pragma: no cover
         hints = {}
 
     if inspect.isclass(thing):
         try:
-            hints.update(typing.get_type_hints(thing.__init__, **kwargs))
+            hints.update(typing.get_type_hints(thing.__init__, include_extras=True))
         except (TypeError, NameError, AttributeError):
             pass
 
@@ -232,7 +230,7 @@ def extract_bits(x: int, /, width: Optional[int] = None) -> List[int]:
     return result
 
 
-# int.bit_count was added sometime around python 3.9
+# int.bit_count was added in python 3.10
 try:
     bit_count = int.bit_count
 except AttributeError:  # pragma: no cover

hypothesis-python/src/hypothesis/internal/conjecture/engine.py

@@ -117,7 +117,9 @@ def timing_report(self) -> str:
         """Return a terminal report describing what was slow."""
         if not self.draw_times:
             return ""
-        width = max(len(k[len("generate:") :].strip(": ")) for k in self.draw_times)
+        width = max(
+            len(k.removeprefix("generate:").removesuffix(": ")) for k in self.draw_times
+        )
         out = [f"\n  {'':^{width}}   count | fraction |    slowest draws (seconds)"]
         args_in_order = sorted(self.draw_times.items(), key=lambda kv: -sum(kv[1]))
         for i, (argname, times) in enumerate(args_in_order):  # pragma: no branch
@@ -132,7 +134,7 @@ def timing_report(self) -> str:
             # Compute the row to report, omitting times <1ms to focus on slow draws
             reprs = [f"{t:>6.3f}," for t in sorted(times)[-5:] if t > 5e-4]
             desc = " ".join((["    -- "] * 5 + reprs)[-5:]).rstrip(",")
-            arg = argname[len("generate:") :].strip(": ")  # removeprefix in py3.9
+            arg = argname.removeprefix("generate:").removesuffix(": ")
             out.append(
                 f"  {arg:^{width}} | {len(times):>4}  | "
                 f"{math.fsum(times)/self.total_draw_time:>7.0%}  |  {desc}"

hypothesis-python/src/hypothesis/internal/reflection.py

@@ -32,7 +32,7 @@
 from weakref import WeakKeyDictionary
 
 from hypothesis.errors import HypothesisWarning
-from hypothesis.internal.compat import PYPY, is_typed_named_tuple
+from hypothesis.internal.compat import is_typed_named_tuple
 from hypothesis.utils.conventions import not_set
 from hypothesis.vendor.pretty import pretty
 
@@ -67,14 +67,7 @@ def _clean_source(src: str) -> bytes:
     # lines - i.e. any decorators, so that adding `@example()`s keeps the same key.
     try:
         funcdef = ast.parse(src).body[0]
-        if sys.version_info[:2] == (3, 8) and PYPY:
-            # We can't get a line number of the (async) def here, so as a best-effort
-            # approximation we'll use str.split instead and hope for the best.
-            tag = "async def " if isinstance(funcdef, ast.AsyncFunctionDef) else "def "
-            if tag in src:
-                src = tag + src.split(tag, maxsplit=1)[1]
-        else:
-            src = "".join(src.splitlines(keepends=True)[funcdef.lineno - 1 :])
+        src = "".join(src.splitlines(keepends=True)[funcdef.lineno - 1 :])
     except Exception:
         pass
     # Remove blank lines and use the tokenize module to strip out comments,
@@ -166,16 +159,6 @@ def get_signature(
                     parameters=[v for k, v in sig.parameters.items() if k != "self"]
                 )
         return sig
-    if sys.version_info[:2] <= (3, 8) and inspect.isclass(target):
-        # Workaround for subclasses of typing.Generic on Python <= 3.8
-        from hypothesis.strategies._internal.types import is_generic_type
-
-        if is_generic_type(target):
-            sig = inspect.signature(target.__init__)
-            check_signature(sig)
-            return sig.replace(
-                parameters=[v for k, v in sig.parameters.items() if k != "self"]
-            )
     # eval_str is only supported by Python 3.10 and newer
     if sys.version_info[:2] >= (3, 10):
         sig = inspect.signature(
@@ -257,7 +240,7 @@ def ast_arguments_matches_signature(args, sig):
     assert isinstance(args, ast.arguments)
     assert isinstance(sig, inspect.Signature)
     expected = []
-    for node in getattr(args, "posonlyargs", ()):  # New in Python 3.8
+    for node in args.posonlyargs:
         expected.append((node.arg, inspect.Parameter.POSITIONAL_ONLY))
     for node in args.args:
         expected.append((node.arg, inspect.Parameter.POSITIONAL_OR_KEYWORD))

hypothesis-python/src/hypothesis/internal/scrutineer.py

@@ -250,15 +250,6 @@ def _get_git_repo_root() -> Path:
         return Path(where)
 
 
-if sys.version_info[:2] <= (3, 8):
-
-    def is_relative_to(self, other):
-        return other == self or other in self.parents
-
-else:
-    is_relative_to = Path.is_relative_to
-
-
 def tractable_coverage_report(trace: Trace) -> Dict[str, List[int]]:
     """Report a simple coverage map which is (probably most) of the user's code."""
     coverage: dict = {}
@@ -272,6 +263,6 @@ def tractable_coverage_report(trace: Trace) -> Dict[str, List[int]]:
         k: sorted(v)
         for k, v in coverage.items()
         if stdlib_fragment not in k
-        and is_relative_to(p := Path(k), _get_git_repo_root())
+        and (p := Path(k)).is_relative_to(_get_git_repo_root())
         and "site-packages" not in p.parts
     }

hypothesis-python/src/hypothesis/provisional.py

@@ -33,13 +33,8 @@
 
 # This file is sourced from http://data.iana.org/TLD/tlds-alpha-by-domain.txt
 # The file contains additional information about the date that it was last updated.
-try:  # pragma: no cover
-    traversable = resources.files("hypothesis.vendor") / "tlds-alpha-by-domain.txt"
-    _comment, *_tlds = traversable.read_text(encoding="utf-8").splitlines()
-except (AttributeError, ValueError):  # pragma: no cover  # .files() was added in 3.9
-    _comment, *_tlds = resources.read_text(
-        "hypothesis.vendor", "tlds-alpha-by-domain.txt", encoding="utf-8"
-    ).splitlines()
+traversable = resources.files("hypothesis.vendor") / "tlds-alpha-by-domain.txt"
+_comment, *_tlds = traversable.read_text(encoding="utf-8").splitlines()
 assert _comment.startswith("#")
 
 # Remove special-use domain names from the list. For more discussion