Commit 5fea9ee9 authored by Ondřej Nový's avatar Ondřej Nový

Backport compatibility with pycodestyle 2.4.0 from upstream (From Ubuntu)

parent 79f82955
......@@ -5,6 +5,8 @@ python-flake8 (3.5.0-2) UNRELEASED; urgency=medium
* d/control: Remove ancient X-Python-Version field
* d/control: Remove ancient X-Python3-Version field
* Convert git repository from git-dpm to gbp layout
* Backport compatibility with pycodestyle 2.4.0 from upstream
(From Ubuntu)
-- Ondřej Nový <onovy@debian.org> Tue, 13 Feb 2018 10:07:33 +0100
......
......@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 11~),
python-mccabe (>= 0.6.0),
python-mock (>= 2.0.0),
python-nose,
python-pycodestyle,
python-pycodestyle (>= 2.4.0),
python-pyflakes (>= 1.5.0),
python-pytest,
python-pytest-runner,
......@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 11~),
python3-mccabe (>= 0.6.0),
python3-mock (>= 2.0.0),
python3-nose,
python3-pycodestyle,
python3-pycodestyle (>= 2.4.0),
python3-pyflakes (>= 1.5.0),
python3-pytest,
python3-pytest-runner,
......@@ -38,6 +38,7 @@ Package: flake8
Architecture: all
Depends: python3-flake8 (=${binary:Version}),
python3-pkg-resources,
python3-pycodestyle (>= 2.4.0),
${misc:Depends},
${python3:Depends},
Replaces: python-flake8 (<< 2.5.4-1),
......@@ -55,6 +56,7 @@ Architecture: all
Depends: python-configparser,
python-enum34,
python-mccabe (>= 0.6.0),
python-pycodestyle (>= 2.4.0),
python-pyflakes (>= 1.5.0),
python-setuptools (>= 30),
${misc:Depends},
......
......@@ -8,11 +8,9 @@ Subject: Remove upper constrains from upstream requirements
setup.py | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/setup.cfg b/setup.cfg
index d1c2524..913fd74 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,9 +8,9 @@ universal = 1
@@ -8,9 +8,9 @@
requires-dist =
enum34; python_version<"3.4"
configparser; python_version<"3.2"
......@@ -20,16 +18,14 @@ index d1c2524..913fd74 100644
- pycodestyle >= 2.0.0, < 2.4.0
- mccabe >= 0.6.0, < 0.7.0
+ pyflakes >= 1.5.0
+ pycodestyle >= 2.0.0
+ pycodestyle >= 2.4.0
+ mccabe >= 0.6.0
[egg_info]
tag_build =
diff --git a/setup.py b/setup.py
index aa45e43..fe0cabb 100644
--- a/setup.py
+++ b/setup.py
@@ -21,9 +21,9 @@ requires = [
@@ -21,9 +21,9 @@
# http://flake8.pycqa.org/en/latest/faq.html#why-does-flake8-use-ranges-for-its-dependencies
# And in which releases we will update those ranges here:
# http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
......@@ -37,7 +33,7 @@ index aa45e43..fe0cabb 100644
- "pycodestyle >= 2.0.0, < 2.4.0",
- "mccabe >= 0.6.0, < 0.7.0",
+ "pyflakes >= 1.5.0",
+ "pycodestyle >= 2.0.0",
+ "pycodestyle >= 2.4.0",
+ "mccabe >= 0.6.0",
"setuptools >= 30",
]
......
From dcc0e7fb9737c9dc7a014d194f404a9a6d9c5583 Mon Sep 17 00:00:00 2001
From: Jimi Cullen <jimifhcullen@gmail.com>
Date: Sun, 15 Apr 2018 10:51:18 +0000
Subject: [PATCH] Add hooks for new pycodestyle checks.
Add hooks for new checks introduced in pycodestyle 2.4.0.
For details of the changes to pycodestyle, see:
https://pycodestyle.readthedocs.io/en/latest/developer.html
---
setup.cfg | 22 +++++++++++-----------
setup.py | 7 +++++--
tox.ini | 2 +-
3 files changed, 17 insertions(+), 14 deletions(-)
--- a/setup.py
+++ b/setup.py
@@ -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',
--- a/tox.ini
+++ b/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,
0001-Remove-upper-constrains-from-upstream-requirements.patch
0002-Add-hooks-for-new-pycodestyle-checks.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment