Merge pull request #12467 from RonnyPfannschmidt/ronny/new-annotations-try-2

from __future__ import annotations + migrate

Author: RonnyPfannschmidt

bench/bench.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 
 

bench/bench_argcomplete.py

@@ -2,6 +2,8 @@
 #                      2.7.5     3.3.2
 # FilesCompleter       75.1109   69.2116
 # FastFilesCompleter    0.7383    1.0760
+from __future__ import annotations
+
 import timeit
 
 

bench/empty.py

@@ -1,2 +1,5 @@
+from __future__ import annotations
+
+
 for i in range(1000):
     exec("def test_func_%d(): pass" % i)

bench/manyparam.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

bench/skip.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

bench/unit_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from unittest import TestCase  # noqa: F401
 
 

bench/xunit.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 for i in range(5000):
     exec(
         f"""

changelog/12467.improvement.rst

@@ -0,0 +1,3 @@
+Migrated all internal type-annotations to the python3.10+ style by using the `annotations` future import.
+
+-- by :user:`RonnyPfannschmidt`

doc/en/conf.py

@@ -15,14 +15,18 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
+from __future__ import annotations
+
 import os
 from pathlib import Path
 import shutil
 from textwrap import dedent
 from typing import TYPE_CHECKING
 
-from _pytest import __version__ as version
+from _pytest import __version__ as full_version
+
 
+version = full_version.split("+")[0]
 
 if TYPE_CHECKING:
     import sphinx.application
@@ -189,6 +193,7 @@
     ("py:class", "SubRequest"),
     ("py:class", "TerminalReporter"),
     ("py:class", "_pytest._code.code.TerminalRepr"),
+    ("py:class", "TerminalRepr"),
     ("py:class", "_pytest.fixtures.FixtureFunctionMarker"),
     ("py:class", "_pytest.logging.LogCaptureHandler"),
     ("py:class", "_pytest.mark.structures.ParameterSet"),
@@ -210,13 +215,16 @@
     ("py:class", "_PluggyPlugin"),
     # TypeVars
     ("py:class", "_pytest._code.code.E"),
+    ("py:class", "E"),  # due to delayed annotation
     ("py:class", "_pytest.fixtures.FixtureFunction"),
     ("py:class", "_pytest.nodes._NodeType"),
+    ("py:class", "_NodeType"),  # due to delayed annotation
     ("py:class", "_pytest.python_api.E"),
     ("py:class", "_pytest.recwarn.T"),
     ("py:class", "_pytest.runner.TResult"),
     ("py:obj", "_pytest.fixtures.FixtureValue"),
     ("py:obj", "_pytest.stash.T"),
+    ("py:class", "_ScopeName"),
 ]
 
 
@@ -455,7 +463,7 @@
 }
 
 
-def setup(app: "sphinx.application.Sphinx") -> None:
+def setup(app: sphinx.application.Sphinx) -> None:
     app.add_crossref_type(
         "fixture",
         "fixture",

doc/en/conftest.py

@@ -1 +1,4 @@
+from __future__ import annotations
+
+
 collect_ignore = ["conf.py"]

doc/en/example/assertion/failure_demo.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 from pytest import raises
 

doc/en/example/assertion/global_testmodule_config/conftest.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 
 import pytest

doc/en/example/assertion/global_testmodule_config/test_hello_world.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 hello = "world"
 
 

doc/en/example/assertion/test_failures.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import shutil
 

doc/en/example/assertion/test_setup_flow_example.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 def setup_module(module):
     module.TestStateFullThing.classcount = 0
 

doc/en/example/conftest.py

@@ -1 +1,4 @@
+from __future__ import annotations
+
+
 collect_ignore = ["nonpython", "customdirectory"]

doc/en/example/customdirectory/conftest.py

@@ -1,4 +1,6 @@
 # content of conftest.py
+from __future__ import annotations
+
 import json
 
 import pytest

doc/en/example/customdirectory/tests/test_first.py

@@ -1,3 +1,6 @@
 # content of test_first.py
+from __future__ import annotations
+
+
 def test_1():
     pass

doc/en/example/customdirectory/tests/test_second.py

@@ -1,3 +1,6 @@
 # content of test_second.py
+from __future__ import annotations
+
+
 def test_2():
     pass

doc/en/example/customdirectory/tests/test_third.py

@@ -1,3 +1,6 @@
 # content of test_third.py
+from __future__ import annotations
+
+
 def test_3():
     pass

doc/en/example/fixtures/test_fixtures_order_autouse.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_order_dependencies.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_order_scope.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_request_different_scope.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/multipython.py

@@ -1,6 +1,8 @@
 """Module containing a parametrized tests testing cross-python serialization
 via the pickle module."""
 
+from __future__ import annotations
+
 import shutil
 import subprocess
 import textwrap

doc/en/example/nonpython/conftest.py

@@ -1,4 +1,6 @@
 # content of conftest.py
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/pythoncollection.py

@@ -1,5 +1,6 @@
 # run this with $ pytest --collect-only test_collectonly.py
 #
+from __future__ import annotations
 
 
 def test_function():

doc/en/example/xfail_demo.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

extra/get_issues.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from pathlib import Path
 import sys

pyproject.toml

@@ -98,6 +98,7 @@ lint.select = [
     "D",       # pydocstyle
     "E",       # pycodestyle
     "F",       # pyflakes
+    "FA100",   # add future annotations
     "I",       # isort
     "PGH004",  # pygrep-hooks - Use specific rule codes when using noqa
     "PIE",     # flake8-pie
@@ -155,6 +156,10 @@ lint.per-file-ignores."src/_pytest/_version.py" = [
 lint.per-file-ignores."testing/python/approx.py" = [
     "B015",
 ]
+lint.extend-safe-fixes = [
+    "UP006",
+    "UP007",
+]
 lint.isort.combine-as-imports = true
 lint.isort.force-single-line = true
 lint.isort.force-sort-within-sections = true
@@ -164,9 +169,13 @@ lint.isort.known-local-folder = [
 ]
 lint.isort.lines-after-imports = 2
 lint.isort.order-by-type = false
+lint.isort.required-imports = [
+    "from __future__ import annotations",
+]
 # In order to be able to format for 88 char in ruff format
 lint.pycodestyle.max-line-length = 120
 lint.pydocstyle.convention = "pep257"
+lint.pyupgrade.keep-runtime-typing = false
 
 [tool.pylint.main]
 # Maximum number of characters on a single line.

scripts/generate-gh-release-notes.py

@@ -9,6 +9,8 @@
 Requires Python3.6+.
 """
 
+from __future__ import annotations
+
 from pathlib import Path
 import re
 import sys

scripts/prepare-release-pr.py

@@ -14,6 +14,8 @@
 `pytest bot <[email protected]>` commit author.
 """
 
+from __future__ import annotations
+
 import argparse
 from pathlib import Path
 import re

scripts/release.py

@@ -1,6 +1,8 @@
 # mypy: disallow-untyped-defs
 """Invoke development tasks."""
 
+from __future__ import annotations
+
 import argparse
 import os
 from pathlib import Path

scripts/update-plugin-list.py

@@ -1,4 +1,6 @@
 # mypy: disallow-untyped-defs
+from __future__ import annotations
+
 import datetime
 import pathlib
 import re

src/_pytest/__init__.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 __all__ = ["__version__", "version_tuple"]
 
 try:

src/_pytest/_argcomplete.py

@@ -62,13 +62,13 @@
   global argcomplete script).
 """
 
+from __future__ import annotations
+
 import argparse
 from glob import glob
 import os
 import sys
 from typing import Any
-from typing import List
-from typing import Optional
 
 
 class FastFilesCompleter:
@@ -77,7 +77,7 @@ class FastFilesCompleter:
     def __init__(self, directories: bool = True) -> None:
         self.directories = directories
 
-    def __call__(self, prefix: str, **kwargs: Any) -> List[str]:
+    def __call__(self, prefix: str, **kwargs: Any) -> list[str]:
         # Only called on non option completions.
         if os.sep in prefix[1:]:
             prefix_dir = len(os.path.dirname(prefix) + os.sep)
@@ -104,7 +104,7 @@ def __call__(self, prefix: str, **kwargs: Any) -> List[str]:
         import argcomplete.completers
     except ImportError:
         sys.exit(-1)
-    filescompleter: Optional[FastFilesCompleter] = FastFilesCompleter()
+    filescompleter: FastFilesCompleter | None = FastFilesCompleter()
 
     def try_argcomplete(parser: argparse.ArgumentParser) -> None:
         argcomplete.autocomplete(parser, always_complete_options=False)

src/_pytest/_code/__init__.py

@@ -1,5 +1,7 @@
 """Python inspection/code generation API."""
 
+from __future__ import annotations
+
 from .code import Code
 from .code import ExceptionInfo
 from .code import filter_traceback