Ruff: enable isort (#405)

Enforcing imports to be sorted using ruff (isort).

54 files changed, 169 insertions, 154 deletions

diff --git a/gitlint-core/gitlint/cli.py b/gitlint-core/gitlint/cli.py
index d1ed456..d10512a 100644
--- a/gitlint-core/gitlint/cli.py
+++ b/gitlint-core/gitlint/cli.py
@@ -6,17 +6,19 @@ import os
 import platform
 import stat
 import sys
+
 import click
 
 import gitlint
-from gitlint.lint import GitLinter
+from gitlint import hooks
 from gitlint.config import LintConfigBuilder, LintConfigError, LintConfigGenerator
-from gitlint.deprecation import LOG as DEPRECATED_LOG, DEPRECATED_LOG_FORMAT
+from gitlint.deprecation import DEPRECATED_LOG_FORMAT
+from gitlint.deprecation import LOG as DEPRECATED_LOG
+from gitlint.exception import GitlintError
 from gitlint.git import GitContext, GitContextError, git_version
-from gitlint import hooks
+from gitlint.lint import GitLinter
 from gitlint.shell import shell
 from gitlint.utils import LOG_FORMAT
-from gitlint.exception import GitlintError
 
 # Error codes
 GITLINT_SUCCESS = 0
diff --git a/gitlint-core/gitlint/config.py b/gitlint-core/gitlint/config.py
index f038d4a..600cbba 100644
--- a/gitlint-core/gitlint/config.py
+++ b/gitlint-core/gitlint/config.py
@@ -1,17 +1,19 @@
-from configparser import ConfigParser, Error as ConfigParserError
-
 import copy
-import re
 import os
+import re
 import shutil
-
 from collections import OrderedDict
-from gitlint.utils import DEFAULT_ENCODING
-from gitlint import rules  # For some weird reason pylint complains about this, pylint: disable=unused-import
-from gitlint import options
-from gitlint import rule_finder
+from configparser import ConfigParser
+from configparser import Error as ConfigParserError
+
+from gitlint import (
+    options,
+    rule_finder,
+    rules,  # For some weird reason pylint complains about this, pylint: disable=unused-import
+)
 from gitlint.contrib import rules as contrib_rules
 from gitlint.exception import GitlintError
+from gitlint.utils import DEFAULT_ENCODING
 
 
 def handle_option_error(func):
diff --git a/gitlint-core/gitlint/contrib/rules/authors_commit.py b/gitlint-core/gitlint/contrib/rules/authors_commit.py
index ce11663..5c4a150 100644
--- a/gitlint-core/gitlint/contrib/rules/authors_commit.py
+++ b/gitlint-core/gitlint/contrib/rules/authors_commit.py
@@ -2,7 +2,6 @@ import re
 from pathlib import Path
 from typing import Tuple
 
-
 from gitlint.rules import CommitRule, RuleViolation
 
 
diff --git a/gitlint-core/gitlint/deprecation.py b/gitlint-core/gitlint/deprecation.py
index bf13460..b7c2f42 100644
--- a/gitlint-core/gitlint/deprecation.py
+++ b/gitlint-core/gitlint/deprecation.py
@@ -1,6 +1,5 @@
 import logging
 
-
 LOG = logging.getLogger("gitlint.deprecated")
 DEPRECATED_LOG_FORMAT = "%(levelname)s: %(message)s"
 
diff --git a/gitlint-core/gitlint/display.py b/gitlint-core/gitlint/display.py
index d21b6c3..79f010a 100644
--- a/gitlint-core/gitlint/display.py
+++ b/gitlint-core/gitlint/display.py
@@ -1,4 +1,4 @@
-from sys import stdout, stderr
+from sys import stderr, stdout
 
 
 class Display:
diff --git a/gitlint-core/gitlint/git.py b/gitlint-core/gitlint/git.py
index 4b292f0..b6c3b21 100644
--- a/gitlint-core/gitlint/git.py
+++ b/gitlint-core/gitlint/git.py
@@ -5,13 +5,12 @@ from pathlib import Path
 import arrow
 
 from gitlint import shell as sh
+from gitlint.cache import PropertyCache, cache
+from gitlint.exception import GitlintError
 
 # import exceptions separately, this makes it a little easier to mock them out in the unit tests
 from gitlint.shell import CommandNotFound, ErrorReturnCode
 
-from gitlint.cache import PropertyCache, cache
-from gitlint.exception import GitlintError
-
 # For now, the git date format we use is fixed, but technically this format is determined by `git config log.date`
 # We should fix this at some point :-)
 GIT_TIMEFORMAT = "YYYY-MM-DD HH:mm:ss Z"
diff --git a/gitlint-core/gitlint/hooks.py b/gitlint-core/gitlint/hooks.py
index 78c5e46..bdc459e 100644
--- a/gitlint-core/gitlint/hooks.py
+++ b/gitlint-core/gitlint/hooks.py
@@ -1,10 +1,10 @@
-import shutil
 import os
+import shutil
 import stat
 
-from gitlint.utils import DEFAULT_ENCODING
-from gitlint.git import git_hooks_dir
 from gitlint.exception import GitlintError
+from gitlint.git import git_hooks_dir
+from gitlint.utils import DEFAULT_ENCODING
 
 COMMIT_MSG_HOOK_SRC_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "files", "commit-msg")
 COMMIT_MSG_HOOK_DST_PATH = "commit-msg"
diff --git a/gitlint-core/gitlint/lint.py b/gitlint-core/gitlint/lint.py
index 3bc1945..c3b7db8 100644
--- a/gitlint-core/gitlint/lint.py
+++ b/gitlint-core/gitlint/lint.py
@@ -1,7 +1,8 @@
 # pylint: disable=logging-not-lazy
 import logging
-from gitlint import rules as gitlint_rules
+
 from gitlint import display
+from gitlint import rules as gitlint_rules
 from gitlint.deprecation import Deprecation
 
 LOG = logging.getLogger(__name__)
diff --git a/gitlint-core/gitlint/options.py b/gitlint-core/gitlint/options.py
index 50565ea..c634ad9 100644
--- a/gitlint-core/gitlint/options.py
+++ b/gitlint-core/gitlint/options.py
@@ -1,6 +1,6 @@
-from abc import abstractmethod
 import os
 import re
+from abc import abstractmethod
 
 from gitlint.exception import GitlintError
 
diff --git a/gitlint-core/gitlint/rule_finder.py b/gitlint-core/gitlint/rule_finder.py
index d485808..a3a6d17 100644
--- a/gitlint-core/gitlint/rule_finder.py
+++ b/gitlint-core/gitlint/rule_finder.py
@@ -1,10 +1,10 @@
 import fnmatch
+import importlib
 import inspect
 import os
 import sys
-import importlib
 
-from gitlint import rules, options
+from gitlint import options, rules
 
 
 def find_rule_classes(extra_path):
diff --git a/gitlint-core/gitlint/rules.py b/gitlint-core/gitlint/rules.py
index 6d486a5..9cf8166 100644
--- a/gitlint-core/gitlint/rules.py
+++ b/gitlint-core/gitlint/rules.py
@@ -3,9 +3,9 @@ import copy
 import logging
 import re
 
-from gitlint.options import IntOption, BoolOption, StrOption, ListOption, RegexOption
-from gitlint.exception import GitlintError
 from gitlint.deprecation import Deprecation
+from gitlint.exception import GitlintError
+from gitlint.options import BoolOption, IntOption, ListOption, RegexOption, StrOption
 
 
 class Rule:
diff --git a/gitlint-core/gitlint/shell.py b/gitlint-core/gitlint/shell.py
index c378c1c..2f66f30 100644
--- a/gitlint-core/gitlint/shell.py
+++ b/gitlint-core/gitlint/shell.py
@@ -5,7 +5,8 @@ capabilities wrt dealing with more edge-case environments on *nix systems that a
 """
 
 import subprocess
-from gitlint.utils import USE_SH_LIB, DEFAULT_ENCODING
+
+from gitlint.utils import DEFAULT_ENCODING, USE_SH_LIB
 
 
 def shell(cmd):
@@ -15,10 +16,12 @@ def shell(cmd):
 
 
 if USE_SH_LIB:
-    from sh import git  # pylint: disable=unused-import,import-error
-
     # import exceptions separately, this makes it a little easier to mock them out in the unit tests
-    from sh import CommandNotFound, ErrorReturnCode  # pylint: disable=import-error
+    from sh import (  # pylint: disable=import-error
+        CommandNotFound,
+        ErrorReturnCode,
+        git,  # pylint: disable=unused-import,import-error
+    )
 else:
 
     class CommandNotFound(Exception):
diff --git a/gitlint-core/gitlint/tests/base.py b/gitlint-core/gitlint/tests/base.py
index 968afaa..0ac51e7 100644
--- a/gitlint-core/gitlint/tests/base.py
+++ b/gitlint-core/gitlint/tests/base.py
@@ -5,16 +5,15 @@ import os
 import re
 import shutil
 import tempfile
-
 import unittest
-
-from unittest.mock import patch
 from pathlib import Path
+from unittest.mock import patch
 
 from gitlint.config import LintConfig
-from gitlint.deprecation import Deprecation, LOG as DEPRECATION_LOG
-from gitlint.git import GitContext, GitChangedFileStats
-from gitlint.utils import LOG_FORMAT, DEFAULT_ENCODING
+from gitlint.deprecation import LOG as DEPRECATION_LOG
+from gitlint.deprecation import Deprecation
+from gitlint.git import GitChangedFileStats, GitContext
+from gitlint.utils import DEFAULT_ENCODING, LOG_FORMAT
 
 EXPECTED_REGEX_STYLE_SEARCH_DEPRECATION_WARNING = (
     "WARNING: gitlint.deprecated.regex_style_search {0} - {1}: gitlint will be switching from using "
diff --git a/gitlint-core/gitlint/tests/cli/test_cli.py b/gitlint-core/gitlint/tests/cli/test_cli.py
index f0177c4..7bf3b4f 100644
--- a/gitlint-core/gitlint/tests/cli/test_cli.py
+++ b/gitlint-core/gitlint/tests/cli/test_cli.py
@@ -1,20 +1,14 @@
 import os
-import sys
 import platform
-
-import arrow
-
+import sys
 from io import StringIO
-
-from click.testing import CliRunner
-
 from unittest.mock import patch
 
+import arrow
+from click.testing import CliRunner
+from gitlint import __version__, cli
 from gitlint.shell import CommandNotFound
-
 from gitlint.tests.base import BaseTestCase
-from gitlint import cli
-from gitlint import __version__
 from gitlint.utils import DEFAULT_ENCODING
 
 
diff --git a/gitlint-core/gitlint/tests/cli/test_cli_hooks.py b/gitlint-core/gitlint/tests/cli/test_cli_hooks.py
index cfdb704..641961d 100644
--- a/gitlint-core/gitlint/tests/cli/test_cli_hooks.py
+++ b/gitlint-core/gitlint/tests/cli/test_cli_hooks.py
@@ -1,16 +1,11 @@
-from io import StringIO
 import os
-
-from click.testing import CliRunner
-
+from io import StringIO
 from unittest.mock import patch
 
-from gitlint.tests.base import BaseTestCase
-from gitlint import cli
-from gitlint import hooks
-from gitlint import config
+from click.testing import CliRunner
+from gitlint import cli, config, hooks
 from gitlint.shell import ErrorReturnCode
-
+from gitlint.tests.base import BaseTestCase
 from gitlint.utils import DEFAULT_ENCODING
 
 
diff --git a/gitlint-core/gitlint/tests/config/test_config.py b/gitlint-core/gitlint/tests/config/test_config.py
index 852bf75..e70bebe 100644
--- a/gitlint-core/gitlint/tests/config/test_config.py
+++ b/gitlint-core/gitlint/tests/config/test_config.py
@@ -1,8 +1,12 @@
 from unittest.mock import patch
 
-from gitlint import rules
-from gitlint.config import LintConfig, LintConfigError, LintConfigGenerator, GITLINT_CONFIG_TEMPLATE_SRC_PATH
-from gitlint import options
+from gitlint import options, rules
+from gitlint.config import (
+    GITLINT_CONFIG_TEMPLATE_SRC_PATH,
+    LintConfig,
+    LintConfigError,
+    LintConfigGenerator,
+)
 from gitlint.tests.base import BaseTestCase
 
 
diff --git a/gitlint-core/gitlint/tests/config/test_config_builder.py b/gitlint-core/gitlint/tests/config/test_config_builder.py
index dfb77cd..eee4afa 100644
--- a/gitlint-core/gitlint/tests/config/test_config_builder.py
+++ b/gitlint-core/gitlint/tests/config/test_config_builder.py
@@ -1,10 +1,8 @@
 import copy
 
-from gitlint.tests.base import BaseTestCase
-
-from gitlint.config import LintConfig, LintConfigBuilder, LintConfigError
-
 from gitlint import rules
+from gitlint.config import LintConfig, LintConfigBuilder, LintConfigError
+from gitlint.tests.base import BaseTestCase
 
 
 class LintConfigBuilderTests(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/config/test_config_precedence.py b/gitlint-core/gitlint/tests/config/test_config_precedence.py
index 22197e8..a7f94cf 100644
--- a/gitlint-core/gitlint/tests/config/test_config_precedence.py
+++ b/gitlint-core/gitlint/tests/config/test_config_precedence.py
@@ -1,12 +1,10 @@
 from io import StringIO
-
-from click.testing import CliRunner
-
 from unittest.mock import patch
 
-from gitlint.tests.base import BaseTestCase
+from click.testing import CliRunner
 from gitlint import cli
 from gitlint.config import LintConfigBuilder
+from gitlint.tests.base import BaseTestCase
 
 
 class LintConfigPrecedenceTests(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/config/test_rule_collection.py b/gitlint-core/gitlint/tests/config/test_rule_collection.py
index ea7039f..2cb0e5c 100644
--- a/gitlint-core/gitlint/tests/config/test_rule_collection.py
+++ b/gitlint-core/gitlint/tests/config/test_rule_collection.py
@@ -1,4 +1,5 @@
 from collections import OrderedDict
+
 from gitlint import rules
 from gitlint.config import RuleCollection
 from gitlint.tests.base import BaseTestCase
diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_authors_commit.py b/gitlint-core/gitlint/tests/contrib/rules/test_authors_commit.py
index 5ea9d8f..5cc3355 100644
--- a/gitlint-core/gitlint/tests/contrib/rules/test_authors_commit.py
+++ b/gitlint-core/gitlint/tests/contrib/rules/test_authors_commit.py
@@ -1,10 +1,10 @@
 from collections import namedtuple
 from unittest.mock import patch
-from gitlint.tests.base import BaseTestCase
-from gitlint.rules import RuleViolation
-from gitlint.config import LintConfig
 
+from gitlint.config import LintConfig
 from gitlint.contrib.rules.authors_commit import AllowedAuthors
+from gitlint.rules import RuleViolation
+from gitlint.tests.base import BaseTestCase
 
 
 class ContribAuthorsCommitTests(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py b/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py
index 7ce9c89..cbab684 100644
--- a/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py
+++ b/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py
@@ -1,7 +1,7 @@
-from gitlint.tests.base import BaseTestCase
-from gitlint.rules import RuleViolation
-from gitlint.contrib.rules.conventional_commit import ConventionalCommit
 from gitlint.config import LintConfig
+from gitlint.contrib.rules.conventional_commit import ConventionalCommit
+from gitlint.rules import RuleViolation
+from gitlint.tests.base import BaseTestCase
 
 
 class ContribConventionalCommitTests(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py b/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py
index 841640a..1983367 100644
--- a/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py
+++ b/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py
@@ -1,8 +1,7 @@
-from gitlint.tests.base import BaseTestCase
-from gitlint.rules import RuleViolation
-from gitlint.contrib.rules.disallow_cleanup_commits import DisallowCleanupCommits
-
 from gitlint.config import LintConfig
+from gitlint.contrib.rules.disallow_cleanup_commits import DisallowCleanupCommits
+from gitlint.rules import RuleViolation
+from gitlint.tests.base import BaseTestCase
 
 
 class ContribDisallowCleanupCommitsTest(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py b/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py
index 88ff1db..bf526a0 100644
--- a/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py
+++ b/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py
@@ -1,8 +1,7 @@
-from gitlint.tests.base import BaseTestCase
-from gitlint.rules import RuleViolation
-from gitlint.contrib.rules.signedoff_by import SignedOffBy
-
 from gitlint.config import LintConfig
+from gitlint.contrib.rules.signedoff_by import SignedOffBy
+from gitlint.rules import RuleViolation
+from gitlint.tests.base import BaseTestCase
 
 
 class ContribSignedOffByTests(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py b/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py
index bd098c6..b0372d8 100644
--- a/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py
+++ b/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py
@@ -1,9 +1,9 @@
 import os
 
-from gitlint.tests.base import BaseTestCase
+from gitlint import rule_finder, rules
 from gitlint.contrib import rules as contrib_rules
+from gitlint.tests.base import BaseTestCase
 from gitlint.tests.contrib import rules as contrib_tests
-from gitlint import rule_finder, rules
 
 
 class ContribRuleTests(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/git/test_git.py b/gitlint-core/gitlint/tests/git/test_git.py
index 9c73bd9..b6a146a 100644
--- a/gitlint-core/gitlint/tests/git/test_git.py
+++ b/gitlint-core/gitlint/tests/git/test_git.py
@@ -1,11 +1,15 @@
 import os
-
-from unittest.mock import patch, call
-
-from gitlint.shell import ErrorReturnCode, CommandNotFound
-
+from unittest.mock import call, patch
+
+from gitlint.git import (
+    GitContext,
+    GitContextError,
+    GitNotInstalledError,
+    git_commentchar,
+    git_hooks_dir,
+)
+from gitlint.shell import CommandNotFound, ErrorReturnCode
 from gitlint.tests.base import BaseTestCase
-from gitlint.git import GitContext, GitContextError, GitNotInstalledError, git_commentchar, git_hooks_dir
 
 
 class GitTests(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/git/test_git_commit.py b/gitlint-core/gitlint/tests/git/test_git_commit.py
index ee76a96..4e2439c 100644
--- a/gitlint-core/gitlint/tests/git/test_git_commit.py
+++ b/gitlint-core/gitlint/tests/git/test_git_commit.py
@@ -1,24 +1,21 @@
 import copy
 import datetime
 from pathlib import Path
-
-import dateutil
+from unittest.mock import call, patch
 
 import arrow
-
-from unittest.mock import patch, call
-
-from gitlint.tests.base import BaseTestCase
+import dateutil
 from gitlint.git import (
-    GitContext,
+    GitChangedFileStats,
     GitCommit,
+    GitCommitMessage,
+    GitContext,
     GitContextError,
     LocalGitCommit,
     StagedLocalGitCommit,
-    GitCommitMessage,
-    GitChangedFileStats,
 )
 from gitlint.shell import ErrorReturnCode
+from gitlint.tests.base import BaseTestCase
 
 
 class GitCommitTests(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/git/test_git_context.py b/gitlint-core/gitlint/tests/git/test_git_context.py
index 3dcbe4a..751136c 100644
--- a/gitlint-core/gitlint/tests/git/test_git_context.py
+++ b/gitlint-core/gitlint/tests/git/test_git_context.py
@@ -1,7 +1,7 @@
-from unittest.mock import patch, call
+from unittest.mock import call, patch
 
-from gitlint.tests.base import BaseTestCase
 from gitlint.git import GitContext
+from gitlint.tests.base import BaseTestCase
 
 
 class GitContextTests(BaseTestCase):
diff --git a/gitlint-core/gitlint/tests/rules/test_body_rules.py b/gitlint-core/gitlint/tests/rules/test_body_rules.py
index 94b1edf..1ed4f90 100644
--- a/gitlint-core/gitlint/tests/rules/test_body_rules.py
+++ b/gitlint-core/gitlint/tests/rules/test_body_rules.py
@@ -1,5 +1,5 @@
-from gitlint.tests.base import BaseTestCase
 f