Merge branch 'pycodestyle2.4.0' into 'master'

Remove pycodestyle.break_around_binary_operator hook to work with pycodestyle 2.4.0

See merge request pycqa/flake8!230
This commit is contained in:
Ian Stapleton Cordasco 2018-04-15 19:24:47 +00:00
commit 69b1eb3379
3 changed files with 5 additions and 4 deletions

View file

@ -14,5 +14,5 @@ requires-dist =
enum34; python_version<"3.4"
configparser; python_version<"3.2"
pyflakes >= 1.5.0, < 1.7.0
pycodestyle >= 2.3.0, < 2.4.0
pycodestyle >= 2.4.0, < 2.5.0
mccabe >= 0.6.0, < 0.7.0

View file

@ -22,7 +22,7 @@ requires = [
# And in which releases we will update those ranges here:
# http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
"pyflakes >= 1.5.0, < 1.7.0",
"pycodestyle >= 2.3.0, < 2.4.0",
"pycodestyle >= 2.4.0, < 2.5.0",
"mccabe >= 0.6.0, < 0.7.0",
"setuptools >= 30",
]
@ -108,7 +108,8 @@ setuptools.setup(
PEP8_PLUGIN('module_imports_on_top_of_file'),
PEP8_PLUGIN('compound_statements'),
PEP8_PLUGIN('explicit_line_join'),
PEP8_PLUGIN('break_around_binary_operator'),
PEP8_PLUGIN('break_after_binary_operator'),
PEP8_PLUGIN('break_before_binary_operator'),
PEP8_PLUGIN('comparison_to_singleton'),
PEP8_PLUGIN('comparison_negative'),
PEP8_PLUGIN('comparison_type'),

View file

@ -143,7 +143,7 @@ commands =
# defaults to selecting all other errors so we do not need select=E,F,W,I,D
# Once Flake8 3.0 is released and in a good state, we can use both and it will
# work well \o/
ignore = D203
ignore = D203, W504
exclude =
.tox,
.git,