Merge pull request #11896 from nicoddemus/isort

Replace reorder-python-imports by isort due to black incompatibility

Author: nicoddemus

.gitblameignore renamed to .git-blame-ignore-revs

@@ -26,3 +26,6 @@ afc607cfd81458d4e4f3b1f3cf8cc931b933907e
 
 # move argument parser to own file
 c9df77cbd6a365dcb73c39618e4842711817e871
+
+# Replace reorder-python-imports by isort due to black incompatibility (#11896)
+8b54596639f41dfac070030ef20394b9001fe63c

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.1.1
     hooks:
     -   id: black
         args: [--safe, --quiet]
@@ -36,11 +36,12 @@ repos:
         additional_dependencies:
           - flake8-typing-imports==1.12.0
           - flake8-docstrings==1.5.0
--   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
+-   repo: https://github.com/pycqa/isort
+    rev: 5.13.2
     hooks:
-    -   id: reorder-python-imports
-        args: ['--application-directories=.:src', --py38-plus]
+      - id: isort
+        name: isort
+        args: [--force-single-line, --profile=black]
 -   repo: https://github.com/asottile/pyupgrade
     rev: v3.15.0
     hooks:

bench/bench.py

@@ -2,9 +2,10 @@
 
 if __name__ == "__main__":
     import cProfile
-    import pytest  # NOQA
     import pstats
 
+    import pytest  # NOQA
+
     script = sys.argv[1:] if len(sys.argv) > 1 else ["empty.py"]
     cProfile.run("pytest.cmdline.main(%r)" % script, "prof")
     p = pstats.Stats("prof")

doc/en/conf.py

@@ -440,9 +440,10 @@
 
 def configure_logging(app: "sphinx.application.Sphinx") -> None:
     """Configure Sphinx's WarningHandler to handle (expected) missing include."""
-    import sphinx.util.logging
     import logging
 
+    import sphinx.util.logging
+
     class WarnLogFilter(logging.Filter):
         def filter(self, record: logging.LogRecord) -> bool:
             """Ignore warnings about missing include with "only" directive.

doc/en/example/multipython.py

@@ -1,12 +1,12 @@
 """Module containing a parametrized tests testing cross-python serialization
 via the pickle module."""
+
 import shutil
 import subprocess
 import textwrap
 
 import pytest
 
-
 pythonlist = ["python3.9", "python3.10", "python3.11"]
 
 

scripts/update-plugin-list.py

@@ -19,7 +19,6 @@
 from requests_cache import SQLiteCache
 from tqdm import tqdm
 
-
 FILE_HEAD = r"""
 .. Note this file is autogenerated by scripts/update-plugin-list.py - usually weekly via github action
 

src/_pytest/__init__.py

@@ -1,7 +1,8 @@
 __all__ = ["__version__", "version_tuple"]
 
 try:
-    from ._version import version as __version__, version_tuple
+    from ._version import version as __version__
+    from ._version import version_tuple
 except ImportError:  # pragma: no cover
     # broken installation, we don't even try
     # unknown only works because we do poor mans version compare

src/_pytest/_argcomplete.py

@@ -61,6 +61,7 @@
   which should throw a KeyError: 'COMPLINE' (which is properly set by the
   global argcomplete script).
 """
+
 import argparse
 import os
 import sys

src/_pytest/_code/__init__.py

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

src/_pytest/_code/code.py

@@ -278,9 +278,9 @@ def ishidden(self, excinfo: Optional["ExceptionInfo[BaseException]"]) -> bool:
 
         Mostly for internal use.
         """
-        tbh: Union[
-            bool, Callable[[Optional[ExceptionInfo[BaseException]]], bool]
-        ] = False
+        tbh: Union[bool, Callable[[Optional[ExceptionInfo[BaseException]]], bool]] = (
+            False
+        )
         for maybe_ns_dct in (self.frame.f_locals, self.frame.f_globals):
             # in normal cases, f_locals and f_globals are dictionaries
             # however via `exec(...)` / `eval(...)` they can be other types
@@ -377,12 +377,10 @@ def cut(
         return self
 
     @overload
-    def __getitem__(self, key: "SupportsIndex") -> TracebackEntry:
-        ...
+    def __getitem__(self, key: "SupportsIndex") -> TracebackEntry: ...
 
     @overload
-    def __getitem__(self, key: slice) -> "Traceback":
-        ...
+    def __getitem__(self, key: slice) -> "Traceback": ...
 
     def __getitem__(
         self, key: Union["SupportsIndex", slice]
@@ -1056,13 +1054,13 @@ def repr_excinfo(
                 # full support for exception groups added to ExceptionInfo.
                 # See https://github.com/pytest-dev/pytest/issues/9159
                 if isinstance(e, BaseExceptionGroup):
-                    reprtraceback: Union[
-                        ReprTracebackNative, ReprTraceback
-                    ] = ReprTracebackNative(
-                        traceback.format_exception(
-                            type(excinfo_.value),
-                            excinfo_.value,
-                            excinfo_.traceback[0]._rawentry,
+                    reprtraceback: Union[ReprTracebackNative, ReprTraceback] = (
+                        ReprTracebackNative(
+                            traceback.format_exception(
+                                type(excinfo_.value),
+                                excinfo_.value,
+                                excinfo_.traceback[0]._rawentry,
+                            )
                         )
                     )
                 else: