Merge branch 'remove-verbose-config' into 'master'

options: Remove parsing `--verbose` from the configuration file

See merge request pycqa/flake8!360
This commit is contained in:
Eric N. Vander Weele 2019-10-12 13:26:57 +00:00
commit c85cf0dbb4
4 changed files with 1 additions and 18 deletions

View file

@ -155,13 +155,7 @@ Options and their Descriptions
flake8 -vv flake8 -vv
This **can** be specified in config files. This **can not** be specified in config files.
Example config file usage:
.. code-block:: ini
verbose = 2
.. option:: -q, --quiet .. option:: -q, --quiet

View file

@ -48,7 +48,6 @@ def register_default_options(option_manager):
"--verbose", "--verbose",
default=0, default=0,
action="count", action="count",
parse_from_config=True,
help="Print more information about what is happening in flake8." help="Print more information about what is happening in flake8."
" This option is repeatable and will increase verbosity each " " This option is repeatable and will increase verbosity each "
"time it is repeated.", "time it is repeated.",

View file

@ -7,5 +7,4 @@ exclude =
foo/, foo/,
bar/, bar/,
bogus/ bogus/
verbose = 2
quiet = 1 quiet = 1

View file

@ -27,8 +27,6 @@ def test_parse_cli_config(optmanager, config_finder):
normalize_paths=True) normalize_paths=True)
optmanager.add_option('--ignore', parse_from_config=True, optmanager.add_option('--ignore', parse_from_config=True,
comma_separated_list=True) comma_separated_list=True)
optmanager.add_option('--verbose', parse_from_config=True,
action='count')
optmanager.add_option('--quiet', parse_from_config=True, optmanager.add_option('--quiet', parse_from_config=True,
action='count') action='count')
parser = config.MergedConfigParser(optmanager, config_finder) parser = config.MergedConfigParser(optmanager, config_finder)
@ -43,7 +41,6 @@ def test_parse_cli_config(optmanager, config_finder):
os.path.abspath('bar/'), os.path.abspath('bar/'),
os.path.abspath('bogus/'), os.path.abspath('bogus/'),
], ],
'verbose': 2,
'quiet': 1, 'quiet': 1,
} }
@ -68,8 +65,6 @@ def test_parse_user_config(optmanager, config_finder):
normalize_paths=True) normalize_paths=True)
optmanager.add_option('--ignore', parse_from_config=True, optmanager.add_option('--ignore', parse_from_config=True,
comma_separated_list=True) comma_separated_list=True)
optmanager.add_option('--verbose', parse_from_config=True,
action='count')
optmanager.add_option('--quiet', parse_from_config=True, optmanager.add_option('--quiet', parse_from_config=True,
action='count') action='count')
parser = config.MergedConfigParser(optmanager, config_finder) parser = config.MergedConfigParser(optmanager, config_finder)
@ -85,7 +80,6 @@ def test_parse_user_config(optmanager, config_finder):
os.path.abspath('bar/'), os.path.abspath('bar/'),
os.path.abspath('bogus/'), os.path.abspath('bogus/'),
], ],
'verbose': 2,
'quiet': 1, 'quiet': 1,
} }
@ -97,8 +91,6 @@ def test_parse_local_config(optmanager, config_finder):
normalize_paths=True) normalize_paths=True)
optmanager.add_option('--ignore', parse_from_config=True, optmanager.add_option('--ignore', parse_from_config=True,
comma_separated_list=True) comma_separated_list=True)
optmanager.add_option('--verbose', parse_from_config=True,
action='count')
optmanager.add_option('--quiet', parse_from_config=True, optmanager.add_option('--quiet', parse_from_config=True,
action='count') action='count')
parser = config.MergedConfigParser(optmanager, config_finder) parser = config.MergedConfigParser(optmanager, config_finder)
@ -116,7 +108,6 @@ def test_parse_local_config(optmanager, config_finder):
os.path.abspath('bar/'), os.path.abspath('bar/'),
os.path.abspath('bogus/'), os.path.abspath('bogus/'),
], ],
'verbose': 2,
'quiet': 1, 'quiet': 1,
} }