pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-10 14:54:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1506 from asottile/fix-enable

Browse source 
fix extended_default_select from plugin loading
This commit is contained in:
Anthony Sottile 2022-01-01 19:48:40 -05:00 • committed by GitHub
commit 8a3c2183e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/flake8/options/manager.py
View file

@ -376,7 +376,8 @@ class OptionManager:
_set_group(loaded.plugin.package) _set_group(loaded.plugin.package)
add_options(self) add_options(self)
self.extend_default_select(loaded.entry_name) if loaded.plugin.entry_point.group == "flake8.extension":
self.extend_default_select([loaded.entry_name])
# isn't strictly necessary, but seems cleaner # isn't strictly necessary, but seems cleaner
self._current_group = None self._current_group = None

5
src/flake8/plugins/finder.py
View file

@ -102,6 +102,11 @@ def _flake8_plugins(
if ep.name == "F": if ep.name == "F":
yield Plugin(pyflakes_meta["name"], pyflakes_meta["version"], ep) yield Plugin(pyflakes_meta["name"], pyflakes_meta["version"], ep)
elif ep.name.startswith("pycodestyle"): elif ep.name.startswith("pycodestyle"):
# pycodestyle provides both `E` and `W` -- but our default select
# handles those
# ideally pycodestyle's plugin entrypoints would exactly represent
# the codes they produce...
ep = importlib_metadata.EntryPoint("E", ep.value, ep.group)
yield Plugin( yield Plugin(
pycodestyle_meta["name"], pycodestyle_meta["version"], ep pycodestyle_meta["name"], pycodestyle_meta["version"], ep
) )

1
tests/integration/test_plugins.py
View file

@ -95,6 +95,7 @@ def test_local_plugin_can_add_option(local_config):
args = aggregator.aggregate_options(option_manager, cfg, cfg_dir, argv) args = aggregator.aggregate_options(option_manager, cfg, cfg_dir, argv)
assert args.extended_default_select == {"XE", "F", "E", "C90"}
assert args.anopt == "foo" assert args.anopt == "foo"

12
tests/unit/plugins/finder_test.py
View file

@ -179,7 +179,7 @@ def test_flake8_plugins(flake8_dist, mock_distribution):
"pycodestyle", "pycodestyle",
"9000.2.0", "9000.2.0",
importlib_metadata.EntryPoint( importlib_metadata.EntryPoint(
"pycodestyle.bare_except", "E",
"pycodestyle:bare_except", "pycodestyle:bare_except",
"flake8.extension", "flake8.extension",
), ),
@ -188,7 +188,7 @@ def test_flake8_plugins(flake8_dist, mock_distribution):
"pycodestyle", "pycodestyle",
"9000.2.0", "9000.2.0",
importlib_metadata.EntryPoint( importlib_metadata.EntryPoint(
"pycodestyle.blank_lines", "E",
"pycodestyle:blank_lines", "pycodestyle:blank_lines",
"flake8.extension", "flake8.extension",
), ),
@ -274,7 +274,7 @@ unrelated = unrelated:main
"pycodestyle", "pycodestyle",
"9000.2.0", "9000.2.0",
importlib_metadata.EntryPoint( importlib_metadata.EntryPoint(
"pycodestyle.bare_except", "E",
"pycodestyle:bare_except", "pycodestyle:bare_except",
"flake8.extension", "flake8.extension",
), ),
@ -283,7 +283,7 @@ unrelated = unrelated:main
"pycodestyle", "pycodestyle",
"9000.2.0", "9000.2.0",
importlib_metadata.EntryPoint( importlib_metadata.EntryPoint(
"pycodestyle.blank_lines", "E",
"pycodestyle:blank_lines", "pycodestyle:blank_lines",
"flake8.extension", "flake8.extension",
), ),
@ -459,7 +459,7 @@ def test_find_plugins(
"pycodestyle", "pycodestyle",
"9000.2.0", "9000.2.0",
importlib_metadata.EntryPoint( importlib_metadata.EntryPoint(
"pycodestyle.bare_except", "E",
"pycodestyle:bare_except", "pycodestyle:bare_except",
"flake8.extension", "flake8.extension",
), ),
@ -468,7 +468,7 @@ def test_find_plugins(
"pycodestyle", "pycodestyle",
"9000.2.0", "9000.2.0",
importlib_metadata.EntryPoint( importlib_metadata.EntryPoint(
"pycodestyle.blank_lines", "E",
"pycodestyle:blank_lines", "pycodestyle:blank_lines",
"flake8.extension", "flake8.extension",
), ),