Skip to content

Commit

Permalink
Merge branch 'pycodestyle2.4.0' into 'master'
Browse files Browse the repository at this point in the history
Remove pycodestyle.break_around_binary_operator hook to work with pycodestyle 2.4.0

See merge request pycqa/flake8!230
  • Loading branch information
sigmavirus24 committed Apr 15, 2018
2 parents f834499 + e61d9d2 commit 69b1eb3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# 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",
]
Expand Down Expand Up @@ -108,7 +108,8 @@ def get_long_description():
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'),
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 69b1eb3

Please sign in to comment.