Merge pull request #4 from pypros/update-flake8-compat-4.x-to-latest

Delivery of compatibility for Flake8 from version 4 to the latest ver…

Author: jaraco

README.rst

@@ -24,7 +24,9 @@ pytest plugin for efficiently checking PEP8 compliance
 Usage
 -----
 
-Install it into a test environment, then run tests with the option::
+Install it into a test environment, then run tests with the option.
+
+.. code-block:: bash
 
     pytest --flake8
 
@@ -60,7 +62,16 @@ All the Flake8 tests are skipping!
 
 By design, results are cached and only changed files are checked.
 
-Run with ``pytest --cache-clear --flake8`` to bypass.
+To bypass this caching mechanism, run the following command:
+
+.. code-block:: bash
+
+    pytest --cache-clear --flake8
+
+Run tests with [tox](https://tox.wiki) (e.g. `pipx run tox`).
+
+For more information, take a look at the `skeleton <https://blog.jaraco.com/skeleton/>`_.
+
 
 Notes
 -----

newsfragments/4.feature.rst

@@ -0,0 +1 @@
+Compatible for Flake8 from version ``flake8>=4``.

pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
 ]
 requires-python = ">=3.9"
 dependencies = [
-	"flake8 >= 5, < 6",
+	"flake8 >= 4.0",
 	"pytest >= 7.0",
 ]
 dynamic = ["version"]

pytest_flake8.py

@@ -6,7 +6,6 @@
 from io import BytesIO, TextIOWrapper
 
 from flake8.main import application
-from flake8.options import config
 
 import pytest
 
@@ -226,29 +225,9 @@ def check_file(
         args += ['--show-source']
     if statistics:
         args += ['--statistics']
-    args += [str(path)]
     app = application.Application()
-    prelim_opts, remaining_args = app.parse_preliminary_options(args)
-    cfg, cfg_dir = config.load_config(
-        config=prelim_opts.config,
-        extra=prelim_opts.append_config,
-        isolated=prelim_opts.isolated,
-    )
-    app.find_plugins(
-        cfg,
-        cfg_dir,
-        enable_extensions=prelim_opts.enable_extensions,
-        require_plugins=prelim_opts.require_plugins,
-    )
-    app.register_plugin_options()
-    app.parse_configuration_and_cli(cfg, cfg_dir, remaining_args)
     if flake8ignore:
-        app.options.ignore = flake8ignore
-    app.make_formatter()  # fix this
-    app.make_guide()
-    app.make_file_checker_manager()
-    app.run_checks()
-    app.formatter.start()
-    app.report_errors()
-    app.formatter.stop()
+        args += ["--ignore", flake8ignore]
+    args += [str(path)]
+    app.run(args)
     return app.result_count

tests/test_flake8.py

@@ -2,9 +2,12 @@
 
 import pathlib
 import textwrap
+from packaging import version
 
 import pytest
 
+from flake8 import __version__ as flake8_version
+
 pytest_plugins = ("pytester",)
 
 
@@ -39,6 +42,10 @@ def test_ignores(self, tmpdir):
         assert ign(tmpdir.join("a/y.py")) == "E203 E300".split()
         assert ign(tmpdir.join("a/z.py")) is None
 
+    @pytest.mark.xfail(
+        version.parse(flake8_version) >= version.parse("6.0.0"),
+        reason="Requires Flake8 version earlier than 6.0.0.",
+    )
     def test_default_flake8_ignores(self, testdir):
         testdir.makeini("""
             [pytest]