Add isort

.pre-commit-config.yaml

@@ -7,3 +7,8 @@ repos:
     rev: 22.8.0
     hooks:
       - id: black
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        name: isort (python)

docopt/__init__.py

@@ -23,11 +23,16 @@
 """
 from __future__ import annotations
 
-import sys
-import re
 import inspect
-
-from typing import Any, Callable, NamedTuple, cast, Type, Tuple, Union
+import re
+import sys
+from typing import Any
+from typing import Callable
+from typing import NamedTuple
+from typing import Tuple
+from typing import Type
+from typing import Union
+from typing import cast
 
 __all__ = ["docopt", "magic_docopt", "magic", "DocoptExit"]
 __version__ = "0.8.1"

examples/arguments_example.py

@@ -19,7 +19,6 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     arguments = docopt(__doc__)
     print(arguments)

examples/calculator_example.py

@@ -16,7 +16,6 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     arguments = docopt(__doc__)
     print(arguments)

examples/counted_example.py

@@ -12,5 +12,4 @@
 """
 from docopt import docopt
 
-
 print(docopt(__doc__))

examples/git/git.py

@@ -27,7 +27,6 @@
 
 from docopt import docopt
 
-
 if __name__ == "__main__":
 
     args = docopt(__doc__, version="git version 1.7.4.4", options_first=True)

examples/git/git_add.py

@@ -18,6 +18,5 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     print(docopt(__doc__))

examples/git/git_branch.py

@@ -28,6 +28,5 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     print(docopt(__doc__))

examples/git/git_checkout.py

@@ -18,6 +18,5 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     print(docopt(__doc__))

examples/git/git_clone.py

@@ -25,6 +25,5 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     print(docopt(__doc__))

examples/git/git_commit.py

@@ -45,6 +45,5 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     print(docopt(__doc__))

examples/git/git_push.py

@@ -22,6 +22,5 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     print(docopt(__doc__))

examples/git/git_remote.py

@@ -17,7 +17,6 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     arguments = docopt(__doc__)
     print(arguments)

examples/interactive_example.py

@@ -15,9 +15,11 @@
     --baud=<n>  Baudrate [default: 9600]
 """
 
-import sys
 import cmd
-from docopt import docopt, DocoptExit
+import sys
+
+from docopt import DocoptExit
+from docopt import docopt
 
 
 def docopt_cmd(func):

examples/naval_fate.py

@@ -18,7 +18,6 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     arguments = docopt(__doc__, version="Naval Fate 2.0")
     print(arguments)

examples/odd_even_example.py

@@ -9,7 +9,6 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     arguments = docopt(__doc__)
     print(arguments)

examples/options_example.py

@@ -33,7 +33,6 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     arguments = docopt(__doc__, version="1.0.0rc2")
     print(arguments)

examples/options_shortcut_example.py

@@ -14,7 +14,6 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     arguments = docopt(__doc__, version="1.0.0rc2")
     print(arguments)

examples/quick_example.py

@@ -6,7 +6,6 @@
 """
 from docopt import docopt
 
-
 if __name__ == "__main__":
     arguments = docopt(__doc__, version="0.1.1rc")
     print(arguments)

examples/validation_example.py

@@ -13,7 +13,11 @@
 from docopt import docopt
 
 try:
-    from schema import Schema, And, Or, Use, SchemaError
+    from schema import And
+    from schema import Or
+    from schema import Schema
+    from schema import SchemaError
+    from schema import Use
 except ImportError:
     exit(
         "This example requires that `schema` data-validation library"

pyproject.toml

@@ -3,3 +3,8 @@ requires = ['setuptools', 'wheel']
 
 [tool.pytest.ini_options]
 testpaths = ["./tests"]
+
+[tool.isort]
+profile = "black"
+# Place each import on its own line to reduce merge conflicts
+force_single_line = true

setup.cfg

@@ -37,6 +37,7 @@ dev =
     black
     build
     flake8
+    isort
     mypy
     pre-commit
     pytest

tests/conftest.py

@@ -1,12 +1,14 @@
 import json
-from pathlib import Path
 import re
-from typing import Generator, Sequence
+from pathlib import Path
+from typing import Generator
+from typing import Sequence
 from unittest import mock
 
-import docopt
 import pytest
 
+import docopt
+
 
 def pytest_collect_file(file_path: Path, path, parent):
     if file_path.suffix == ".docopt" and file_path.stem.startswith("test"):

tests/test_docopt.py

@@ -1,35 +1,35 @@
 from __future__ import annotations
-from typing import Sequence
+
 import re
 from textwrap import dedent
+from typing import Sequence
 
-from docopt import (
-    ParsedOptions,
-    docopt,
-    DocoptExit,
-    DocoptLanguageError,
-    Option,
-    Argument,
-    Command,
-    OptionsShortcut,
-    Required,
-    NotRequired,
-    Either,
-    OneOrMore,
-    lint_docstring,
-    parse_argv,
-    parse_docstring_sections,
-    parse_longer,
-    parse_options,
-    parse_pattern,
-    parse_shorts,
-    formal_usage,
-    Tokens,
-    transform,
-)
 import pytest
 from pytest import raises
 
+from docopt import Argument
+from docopt import Command
+from docopt import DocoptExit
+from docopt import DocoptLanguageError
+from docopt import Either
+from docopt import NotRequired
+from docopt import OneOrMore
+from docopt import Option
+from docopt import OptionsShortcut
+from docopt import ParsedOptions
+from docopt import Required
+from docopt import Tokens
+from docopt import docopt
+from docopt import formal_usage
+from docopt import lint_docstring
+from docopt import parse_argv
+from docopt import parse_docstring_sections
+from docopt import parse_longer
+from docopt import parse_options
+from docopt import parse_pattern
+from docopt import parse_shorts
+from docopt import transform
+
 
 def test_pattern_flat():
     assert Required(OneOrMore(Argument("N")), Option("-a"), Argument("M")).flat() == [

tests/test_docopt_ng.py

@@ -1,10 +1,16 @@
 import pytest
-import docopt
-from docopt import DocoptExit, DocoptLanguageError, Option, Argument, parse_argv, Tokens
 from pytest import raises
+
+import docopt
+from docopt import Argument
+from docopt import DocoptExit
+from docopt import DocoptLanguageError
+from docopt import Option
+from docopt import Tokens
+from docopt import docopt as user_provided_alias_containing_magic
 from docopt import magic
 from docopt import magic_docopt
-from docopt import docopt as user_provided_alias_containing_magic
+from docopt import parse_argv
 
 
 def test_docopt_ng_more_magic_spellcheck_and_expansion():