Merge pull request #1990 from mxr/patch-1

Update hooks and use `autopep8` + `add-trailing-comma` instead of `black`

Author: asottile

.pre-commit-config.yaml

@@ -1,18 +1,22 @@
 repos:
+-   repo: https://github.com/asottile/add-trailing-comma
+    rev: v3.2.0
+    hooks:
+    -   id: add-trailing-comma
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
     -   id: check-yaml
     -   id: debug-statements
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
         exclude: ^tests/fixtures/
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.5.0
+    rev: v2.8.0
     hooks:
     -   id: setup-cfg-fmt
 -   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.14.0
+    rev: v3.15.0
     hooks:
     -   id: reorder-python-imports
         args: [
@@ -21,21 +25,20 @@ repos:
             --add-import, 'from __future__ import annotations',
         ]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.20.0
     hooks:
     -   id: pyupgrade
         args: [--py39-plus]
--   repo: https://github.com/psf/black
-    rev: 23.12.1
+-   repo: https://github.com/hhatto/autopep8
+    rev: v2.3.2
     hooks:
-    -   id: black
-        args: [--line-length=79]
+    -   id: autopep8
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.3.0
     hooks:
     -   id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.17.0
     hooks:
     -   id: mypy
         exclude: ^(docs/|example-plugin/)

setup.cfg

@@ -16,7 +16,6 @@ classifiers =
     Environment :: Console
     Framework :: Flake8
     Intended Audience :: Developers
-    License :: OSI Approved :: MIT License
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only

src/flake8/__init__.py

@@ -66,5 +66,5 @@ def configure_logging(
     LOG.addHandler(handler)
     LOG.setLevel(log_level)
     LOG.debug(
-        "Added a %s logging handler to logger root at %s", filename, __name__
+        "Added a %s logging handler to logger root at %s", filename, __name__,
     )

src/flake8/api/legacy.py

@@ -135,7 +135,7 @@ def excluded(path: str) -> bool:
                     stdin_display_name=self.options.stdin_display_name,
                     filename_patterns=self.options.filename,
                     exclude=self.options.exclude,
-                )
+                ),
             )
             return not paths
 
@@ -153,7 +153,7 @@ def init_report(
         if not issubclass(reporter, formatter.BaseFormatter):
             raise ValueError(
                 "Report should be subclass of "
-                "flake8.formatter.BaseFormatter."
+                "flake8.formatter.BaseFormatter.",
             )
         self._application.formatter = reporter(self.options)
         self._application.guide = None

src/flake8/checker.py

@@ -50,7 +50,7 @@
 
 @contextlib.contextmanager
 def _mp_prefork(
-    plugins: Checkers, options: argparse.Namespace
+    plugins: Checkers, options: argparse.Namespace,
 ) -> Generator[None]:
     # we can save significant startup work w/ `fork` multiprocessing
     global _mp
@@ -77,7 +77,7 @@ def _mp_run(filename: str) -> tuple[str, Results, dict[str, int]]:
     assert _mp is not None, _mp
     plugins, options = _mp
     return FileChecker(
-        filename=filename, plugins=plugins, options=options
+        filename=filename, plugins=plugins, options=options,
     ).run_checks()
 
 
@@ -137,7 +137,7 @@ def _job_count(self) -> int:
         if utils.is_using_stdin(self.options.filenames):
             LOG.warning(
                 "The --jobs option is not compatible with supplying "
-                "input using - . Ignoring --jobs arguments."
+                "input using - . Ignoring --jobs arguments.",
             )
             return 0
 
@@ -252,7 +252,7 @@ def start(self) -> None:
                 stdin_display_name=self.options.stdin_display_name,
                 filename_patterns=self.options.filename,
                 exclude=self.exclude,
-            )
+            ),
         )
         self.jobs = min(len(self.filenames), self.jobs)
 
@@ -332,11 +332,11 @@ def run_check(self, plugin: LoadedPlugin, **arguments: Any) -> Any:
         assert self.processor is not None, self.filename
         try:
             params = self.processor.keyword_arguments_for(
-                plugin.parameters, arguments
+                plugin.parameters, arguments,
             )
         except AttributeError as ae:
             raise exceptions.PluginRequestedUnknownParameters(
-                plugin_name=plugin.display_name, exception=ae
+                plugin_name=plugin.display_name, exception=ae,
             )
         try:
             return plugin.obj(**arguments, **params)
@@ -548,7 +548,7 @@ def handle_newline(self, token_type: int) -> None:
             self.run_logical_checks()
 
     def check_physical_eol(
-        self, token: tokenize.TokenInfo, prev_physical: str
+        self, token: tokenize.TokenInfo, prev_physical: str,
     ) -> None:
         """Run physical checks if and only if it is at the end of the line."""
         assert self.processor is not None
@@ -598,7 +598,7 @@ def _try_initialize_processpool(
 
 
 def find_offset(
-    offset: int, mapping: processor._LogicalMapping
+    offset: int, mapping: processor._LogicalMapping,
 ) -> tuple[int, int]:
     """Find the offset tuple for a single offset."""
     if isinstance(offset, tuple):

src/flake8/formatting/base.py

@@ -110,7 +110,7 @@ def format(self, error: Violation) -> str | None:
             The formatted error string.
         """
         raise NotImplementedError(
-            "Subclass of BaseFormatter did not implement" " format."
+            "Subclass of BaseFormatter did not implement" " format.",
         )
 
     def show_statistics(self, statistics: Statistics) -> None:

src/flake8/main/application.py

@@ -76,7 +76,7 @@ def make_guide(self) -> None:
         assert self.formatter is not None
         assert self.options is not None
         self.guide = style_guide.StyleGuideManager(
-            self.options, self.formatter
+            self.options, self.formatter,
         )
 
     def make_file_checker_manager(self, argv: Sequence[str]) -> None:

src/flake8/main/debug.py

@@ -14,7 +14,7 @@ def information(version: str, plugins: Plugins) -> dict[str, Any]:
             (loaded.plugin.package, loaded.plugin.version)
             for loaded in plugins.all_plugins()
             if loaded.plugin.package not in {"flake8", "local"}
-        }
+        },
     )
     return {
         "version": version,

src/flake8/main/options.py

@@ -32,7 +32,7 @@ def stage1_arg_parser() -> argparse.ArgumentParser:
     )
 
     parser.add_argument(
-        "--output-file", default=None, help="Redirect report to a file."
+        "--output-file", default=None, help="Redirect report to a file.",
     )
 
     # Config file options

src/flake8/options/config.py

@@ -78,7 +78,7 @@ def load_config(
     if config is not None:
         if not cfg.read(config, encoding="UTF-8"):
             raise exceptions.ExecutionError(
-                f"The specified config file does not exist: {config}"
+                f"The specified config file does not exist: {config}",
             )
         cfg_dir = os.path.dirname(config)
     else:
@@ -89,7 +89,7 @@ def load_config(
     for filename in extra:
         if not cfg.read(filename, encoding="UTF-8"):
             raise exceptions.ExecutionError(
-                f"The specified config file does not exist: {filename}"
+                f"The specified config file does not exist: {filename}",
             )
 
     return cfg, cfg_dir
@@ -131,7 +131,7 @@ def parse_config(
                     raise ValueError(
                         f"Error code {error_code!r} "
                         f"supplied to {option_name!r} option "
-                        f"does not match {VALID_CODE_PREFIX.pattern!r}"
+                        f"does not match {VALID_CODE_PREFIX.pattern!r}",
                     )
 
         assert option.config_name is not None