debt: Format Python imports with ruff over isort

Automatically validate formatting through CI.

Author: kieran-ryan

python/.pre-commit-config.yaml

@@ -3,4 +3,5 @@ repos:
     rev: v0.13.0
     hooks:
       - id: ruff-check
+        args: [--fix]
       - id: ruff-format

python/cucumber_expressions/argument.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from typing import Optional, List
+from typing import List, Optional
 
+from cucumber_expressions.errors import CucumberExpressionError
 from cucumber_expressions.group import Group
 from cucumber_expressions.parameter_type import ParameterType
 from cucumber_expressions.tree_regexp import TreeRegexp
-from cucumber_expressions.errors import CucumberExpressionError
 
 
 class Argument:

python/cucumber_expressions/ast.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import Optional, List
+from typing import List, Optional
 
 
 class NodeType(Enum):

python/cucumber_expressions/expression.py

@@ -1,18 +1,18 @@
-from typing import Optional, List
+from typing import List, Optional
 
 from cucumber_expressions.argument import Argument
 from cucumber_expressions.ast import Node, NodeType
-from cucumber_expressions.expression_parser import CucumberExpressionParser
-from cucumber_expressions.parameter_type import ParameterType
-from cucumber_expressions.tree_regexp import TreeRegexp
 from cucumber_expressions.errors import (
-    UndefinedParameterTypeError,
-    ParameterIsNotAllowedInOptional,
-    OptionalIsNotAllowedInOptional,
-    OptionalMayNotBeEmpty,
     AlternativeMayNotBeEmpty,
     AlternativeMayNotExclusivelyContainOptionals,
+    OptionalIsNotAllowedInOptional,
+    OptionalMayNotBeEmpty,
+    ParameterIsNotAllowedInOptional,
+    UndefinedParameterTypeError,
 )
+from cucumber_expressions.expression_parser import CucumberExpressionParser
+from cucumber_expressions.parameter_type import ParameterType
+from cucumber_expressions.tree_regexp import TreeRegexp
 
 ESCAPE_PATTERN = rb"([\\^\[({$.|?*+})\]])"
 

python/cucumber_expressions/expression_generator.py

@@ -2,12 +2,12 @@
 import re
 from typing import List
 
-from cucumber_expressions.generated_expression import GeneratedExpression
-from cucumber_expressions.parameter_type import ParameterType
-from cucumber_expressions.parameter_type_matcher import ParameterTypeMatcher
 from cucumber_expressions.combinatorial_generated_expression_factory import (
     CombinatorialGeneratedExpressionFactory,
 )
+from cucumber_expressions.generated_expression import GeneratedExpression
+from cucumber_expressions.parameter_type import ParameterType
+from cucumber_expressions.parameter_type_matcher import ParameterTypeMatcher
 
 
 class CucumberExpressionGenerator:

python/cucumber_expressions/expression_parser.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from typing import NamedTuple, Optional, Callable, List
+from typing import Callable, List, NamedTuple, Optional
 
-from cucumber_expressions.ast import Token, TokenType, Node, NodeType
+from cucumber_expressions.ast import Node, NodeType, Token, TokenType
 from cucumber_expressions.errors import (
     AlternationNotAllowedInOptional,
     InvalidParameterTypeNameInNode,

python/cucumber_expressions/expression_tokenizer.py

@@ -1,9 +1,9 @@
 from typing import List
 
-from cucumber_expressions.ast import TokenType, Token
+from cucumber_expressions.ast import Token, TokenType
 from cucumber_expressions.errors import (
-    TheEndOfLineCannotBeEscaped,
     CantEscape,
+    TheEndOfLineCannotBeEscaped,
 )
 
 

python/cucumber_expressions/parameter_type_registry.py

@@ -1,14 +1,14 @@
 import functools
 import re
 from decimal import Decimal
-from typing import Optional, List
+from typing import List, Optional
 
-from cucumber_expressions.expression_generator import CucumberExpressionGenerator
-from cucumber_expressions.parameter_type import ParameterType
 from cucumber_expressions.errors import (
-    CucumberExpressionError,
     AmbiguousParameterTypeError,
+    CucumberExpressionError,
 )
+from cucumber_expressions.expression_generator import CucumberExpressionGenerator
+from cucumber_expressions.parameter_type import ParameterType
 
 INTEGER_REGEXPS = [re.compile(r"-?\d+"), re.compile(r"\d+")]
 FLOAT_REGEXP = re.compile(r"(?=.*\d.*)[-+]?\d*(?:\.(?=\d.*))?\d*(?:\d+[E][+-]?\d+)?")

python/cucumber_expressions/regular_expression.py

@@ -1,5 +1,5 @@
 import re
-from typing import Optional, List
+from typing import List, Optional
 
 from cucumber_expressions.argument import Argument
 from cucumber_expressions.parameter_type import ParameterType

python/pyproject.toml

@@ -50,14 +50,10 @@ PyYAML = "^6.0"
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.isort]
-py_version = 38
-profile = "black"
-force_single_line = true
-combine_as_imports = true
-lines_between_types = 1
-lines_after_imports = 2
-src_paths = ["cucumber_expressions", "tests"]
-
 [tool.ruff]
 line-length = 130
+
+[tool.ruff.lint]
+extend-select = [
+  "I",
+]