Merge branch 'main' into lint-type-checking-block

Author: sigmavirus24

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/tox.yml

@@ -1,34 +1,48 @@
-name: tox
+name: tests
 on:
   pull_request:
-    branches: [master]
   push:
-    branches: [master]
+    branches: [main]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+env:
+  FORCE_COLOR: "1"
+  TOX_TESTENV_PASSENV: "FORCE_COLOR"
+  MIN_PYTHON_VERSION: "3.9"
+  DEFAULT_PYTHON_VERSION: "3.13"
+
 jobs:
-  tox:
+  tests:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]  # [macos-latest, ubuntu-latest, windows-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy3.9']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
       - run: pip install --upgrade pip
       - run: pip install tox
       - run: tox -e py
-  tox-jobs:
+  lint:
     strategy:
       fail-fast: false
       matrix:
-        job: [manifest, pep8, setuppy]
+        job: [pep8, release-check]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: 3.x
       - run: pip install --upgrade pip

.pre-commit-config.yaml

@@ -1,28 +1,70 @@
 # To enable this pre-commit hook run:
 # `pip install pre-commit` or `brew install pre-commit`
 # Then run `pre-commit install`
+exclude: 'tests\/test_cases'
 
 # Learn more about this config here: https://pre-commit.com/
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
-      - id: check-yaml
-      - id: detect-private-key
-      - id: end-of-file-fixer
-      - id: mixed-line-ending
-      - id: trailing-whitespace
+    - id: check-added-large-files
+    - id: check-toml
+      types: [toml]
+    - id: check-yaml
+      types: [yaml]
+    - id: end-of-file-fixer
+      types: [text]
+      stages: [pre-commit, pre-push, manual]
+    - id: trailing-whitespace
+      types: [text]
+      stages: [pre-commit, pre-push, manual]
+    - id: detect-private-key
+    - id: mixed-line-ending
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.2
+    rev: v2.4.1
     hooks:
-      - id: codespell
-        additional_dependencies:
-          - tomli
+    - id: codespell
+      additional_dependencies:
+        - tomli
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.3
+    rev: v3.20.0
     hooks:
-      - id: pyupgrade
-        args:
-          - --py37-plus
+    - id: pyupgrade
+      args: [--py39-plus]
+
+  - repo: https://github.com/PyCQA/isort
+    rev: 6.0.1
+    hooks:
+    - id: isort
+
+  - repo: https://github.com/psf/black
+    rev: 25.1.0
+    hooks:
+    - id: black
+
+  # - repo: https://github.com/pre-commit/mirrors-mypy
+  #   rev: v1.16.0
+  #   hooks:
+  #   - id: mypy
+  #     additional_dependencies:
+  #     - types-python-dateutil
+  #     - types-requests
+  #     exclude: ^(docs/|tests/)
+  # - repo: https://github.com/jorisroovers/gitlint
+  #   rev: v0.19.1
+  #   hooks:
+  #   - id: gitlint
+  #
+  - repo: https://github.com/asottile/setup-cfg-fmt
+    rev: v2.8.0
+    hooks:
+    - id: setup-cfg-fmt
+      args: [--min-py3-version, '3.9']
+
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.27.2
+    hooks:
+    - id: gitleaks

CHANGELOG.rst

@@ -40,7 +40,7 @@
   custom styles (that use the nodes directly). This also drops the
   asttokens dependency as it is no longer required.
 * Understand the existence of namespaced packages, thereby allowing
-  different namespaced pacakages to be defined as local or third party.
+  different namespaced packages to be defined as local or third party.
 
 0.15 2017-11-06
 ---------------

flake8_import_order/__about__.py

@@ -1,7 +1,14 @@
 __all__ = [
-    "__title__", "__summary__", "__uri__", "__version__", "__author__",
-    "__email__", "__license__", "__copyright__", '__maintainer__',
-    '__maintainer_email__',
+    "__title__",
+    "__summary__",
+    "__uri__",
+    "__version__",
+    "__author__",
+    "__email__",
+    "__license__",
+    "__copyright__",
+    "__maintainer__",
+    "__maintainer_email__",
 ]
 
 __title__ = "flake8-import-order"
@@ -15,8 +22,8 @@
 __author__ = "Alex Stapleton"
 __email__ = "alexs@prol.etari.at"
 
-__maintainer__ = 'Phil Jones'
-__maintainer_email__ = 'philip.graham.jones+flake8-import@gmail.com'
+__maintainer__ = "Phil Jones"
+__maintainer_email__ = "philip.graham.jones+flake8-import@gmail.com"
 
 __license__ = "LGPLv3"
 __copyright__ = "Copyright 2013-2016 %s" % __author__

flake8_import_order/__init__.py

@@ -2,25 +2,35 @@
 from collections import namedtuple
 from enum import IntEnum
 
-from .__about__ import (
-    __author__, __copyright__, __email__, __license__, __summary__, __title__,
-    __uri__, __version__,
-)
+from .__about__ import __author__
+from .__about__ import __copyright__
+from .__about__ import __email__
+from .__about__ import __license__
+from .__about__ import __summary__
+from .__about__ import __title__
+from .__about__ import __uri__
+from .__about__ import __version__
 from .stdlib_list import STDLIB_NAMES
 
 __all__ = [
-    "__title__", "__summary__", "__uri__", "__version__", "__author__",
-    "__email__", "__license__", "__copyright__",
+    "__title__",
+    "__summary__",
+    "__uri__",
+    "__version__",
+    "__author__",
+    "__email__",
+    "__license__",
+    "__copyright__",
 ]
 
-DEFAULT_IMPORT_ORDER_STYLE = 'cryptography'
+DEFAULT_IMPORT_ORDER_STYLE = "cryptography"
 
 ClassifiedImport = namedtuple(
     'ClassifiedImport',
     ['type', 'is_from', 'modules', 'names', 'lineno', 'level', 'package',
      'type_checking'],
 )
-NewLine = namedtuple('NewLine', ['lineno'])
+NewLine = namedtuple("NewLine", ["lineno"])
 
 
 class ImportType(IntEnum):
@@ -49,7 +59,7 @@ def get_package_names(name):
     package_names = [last_package_name]
 
     for part in reversed(parts):
-        last_package_name = f'{last_package_name}.{part}'
+        last_package_name = f"{last_package_name}.{part}"
         package_names.append(last_package_name)
 
     return package_names
@@ -85,7 +95,12 @@ def visit_Import(self, node):  # noqa: N802
             else:
                 type_ = ImportType.MIXED
             classified_import = ClassifiedImport(
-                type_, False, modules, [], node.lineno, 0,
+                type_,
+                False,
+                modules,
+                [],
+                node.lineno,
+                0,
                 root_package_name(modules[0]),
                 self._type_checking_import(node),
             )
@@ -100,8 +115,12 @@ def visit_ImportFrom(self, node):  # noqa: N802
                 type_ = self._classify_type(module)
             names = [alias.name for alias in node.names]
             classified_import = ClassifiedImport(
-                type_, True, [module], names,
-                node.lineno, node.level,
+                type_,
+                True,
+                [module],
+                names,
+                node.lineno,
+                node.level,
                 root_package_name(module),
                 self._type_checking_import(node),
             )

flake8_import_order/checker.py

@@ -4,10 +4,11 @@
 
 import pycodestyle
 
-from flake8_import_order import ImportVisitor, NewLine
+from flake8_import_order import ImportVisitor
+from flake8_import_order import NewLine
 from flake8_import_order.styles import lookup_entry_point
 
-DEFAULT_IMPORT_ORDER_STYLE = 'cryptography'
+DEFAULT_IMPORT_ORDER_STYLE = "cryptography"
 NOQA_INLINE_REGEXP = re.compile(
     # We're looking for items that look like this:
     # ``# noqa``
@@ -18,11 +19,11 @@
     # We do not care about the ``: `` that follows ``noqa``
     # We do not care about the casing of ``noqa``
     # We want a comma-separated list of errors
-    r'# noqa(?:: (?P<codes>([A-Z][0-9]+(?:[,\s]+)?)+))?',
-    re.IGNORECASE
+    r"# noqa(?:: (?P<codes>([A-Z][0-9]+(?:[,\s]+)?)+))?",
+    re.IGNORECASE,
 )
-COMMA_SEPARATED_LIST_RE = re.compile(r'[,\s]')
-BLANK_LINE_RE = re.compile(r'\s*\n')
+COMMA_SEPARATED_LIST_RE = re.compile(r"[,\s]")
+BLANK_LINE_RE = re.compile(r"\s*\n")
 
 
 class ImportOrderChecker:
@@ -42,7 +43,7 @@ def load_file(self):
             self.lines = pycodestyle.readlines(self.filename)
 
         if self.tree is None:
-            self.tree = ast.parse(''.join(self.lines))
+            self.tree = ast.parse("".join(self.lines))
 
     def error(self, error):
         return error
@@ -52,19 +53,19 @@ def check_order(self):
             self.load_file()
 
         try:
-            style_entry_point = self.options['import_order_style']
+            style_entry_point = self.options["import_order_style"]
         except KeyError:
             style_entry_point = lookup_entry_point(DEFAULT_IMPORT_ORDER_STYLE)
         style_cls = style_entry_point.load()
 
         if style_cls.accepts_application_package_names:
             visitor = self.visitor_class(
-                self.options.get('application_import_names', []),
-                self.options.get('application_package_names', []),
+                self.options.get("application_import_names", []),
+                self.options.get("application_package_names", []),
             )
         else:
             visitor = self.visitor_class(
-                self.options.get('application_import_names', []),
+                self.options.get("application_import_names", []),
                 [],
             )
         visitor.visit(self.tree)
@@ -90,7 +91,7 @@ def error_is_ignored(self, error):
         if noqa_match is None:
             return False
 
-        codes_str = noqa_match.group('codes')
+        codes_str = noqa_match.group("codes")
         if codes_str is None:
             return True
 

flake8_import_order/flake8_linter.py

@@ -1,10 +1,10 @@
 import optparse
 
 from flake8_import_order import __version__
-from flake8_import_order.checker import (
-    DEFAULT_IMPORT_ORDER_STYLE, ImportOrderChecker,
-)
-from flake8_import_order.styles import list_entry_points, lookup_entry_point
+from flake8_import_order.checker import DEFAULT_IMPORT_ORDER_STYLE
+from flake8_import_order.checker import ImportOrderChecker
+from flake8_import_order.styles import list_entry_points
+from flake8_import_order.styles import lookup_entry_point
 
 
 class Linter(ImportOrderChecker):
@@ -99,9 +99,9 @@ def register_opt(parser, *args, **kwargs):
         parser.add_option(*args, **kwargs)
     except (optparse.OptionError, TypeError):
         # Flake8 2.x registration
-        parse_from_config = kwargs.pop('parse_from_config', False)
-        kwargs.pop('comma_separated_list', False)
-        kwargs.pop('normalize_paths', False)
+        parse_from_config = kwargs.pop("parse_from_config", False)
+        kwargs.pop("comma_separated_list", False)
+        kwargs.pop("normalize_paths", False)
         parser.add_option(*args, **kwargs)
         if parse_from_config:
-            parser.config_options.append(args[-1].lstrip('-'))
+            parser.config_options.append(args[-1].lstrip("-"))