55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
https://gitlab.com/pycqa/flake8/merge_requests/230
|
|
https://gitlab.com/pycqa/flake8/merge_requests/231
|
|
|
|
--- setup.cfg.orig
|
|
+++ setup.cfg
|
|
@@ -9,7 +9,7 @@
|
|
enum34; python_version<"3.4"
|
|
configparser; python_version<"3.2"
|
|
pyflakes >= 1.5.0, < 1.7.0
|
|
- pycodestyle >= 2.0.0, < 2.4.0
|
|
+ pycodestyle >= 2.4.0, < 2.5.0
|
|
mccabe >= 0.6.0, < 0.7.0
|
|
|
|
[egg_info]
|
|
--- setup.py.orig
|
|
+++ setup.py
|
|
@@ -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.0.0, < 2.4.0",
|
|
+ "pycodestyle >= 2.4.0, < 2.5.0",
|
|
"mccabe >= 0.6.0, < 0.7.0",
|
|
"setuptools >= 30",
|
|
]
|
|
@@ -108,7 +108,8 @@
|
|
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'),
|
|
@@ -118,6 +119,8 @@
|
|
PEP8_PLUGIN('python_3000_raise_comma'),
|
|
PEP8_PLUGIN('python_3000_not_equal'),
|
|
PEP8_PLUGIN('python_3000_backticks'),
|
|
+ PEP8_PLUGIN('python_3000_invalid_escape_sequence'),
|
|
+ PEP8_PLUGIN('python_3000_async_await_keywords'),
|
|
],
|
|
'flake8.report': [
|
|
'default = flake8.formatting.default:Default',
|
|
--- tox.ini.orig
|
|
+++ tox.ini
|
|
@@ -141,7 +141,7 @@
|
|
# 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,
|