From 1ff275e8c19553b147c362da5412621b51c7d907 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Jun 04 2018 14:51:25 +0000
Subject: apply upstream changes to use pycodestyle 2.4.0


---

diff --git a/python-flake8-3.5.0-fix-pycodestyle24.patch b/python-flake8-3.5.0-fix-pycodestyle24.patch
new file mode 100644
index 0000000..f352bd0
--- /dev/null
+++ b/python-flake8-3.5.0-fix-pycodestyle24.patch
@@ -0,0 +1,43 @@
+diff -up flake8-3.5.0/setup.cfg.pycodestyle24 flake8-3.5.0/setup.cfg
+--- flake8-3.5.0/setup.cfg.pycodestyle24	2018-06-04 10:46:24.488822895 -0400
++++ flake8-3.5.0/setup.cfg	2018-06-04 10:46:37.544491979 -0400
+@@ -9,7 +9,7 @@ requires-dist =
+ 	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]
+diff -up flake8-3.5.0/setup.py.pycodestyle24 flake8-3.5.0/setup.py
+--- flake8-3.5.0/setup.py.pycodestyle24	2018-06-04 10:46:44.519315192 -0400
++++ flake8-3.5.0/setup.py	2018-06-04 10:48:39.730394989 -0400
+@@ -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.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 @@ 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'),
+@@ -118,6 +119,8 @@ setuptools.setup(
+             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',
diff --git a/python-flake8.spec b/python-flake8.spec
index 9cfd146..6dff1b0 100644
--- a/python-flake8.spec
+++ b/python-flake8.spec
@@ -13,17 +13,22 @@
 %global modname flake8
 
 %global pyflakes_dep    >= 1.5.0
-%global pycodestyle_dep >= 2.0.0
+%global pycodestyle_dep >= 2.4.0
 %global mccabe_dep      >= 0.6.0
 
 Name:             python-%{modname}
 Version:          3.5.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Python code checking using pyflakes, pycodestyle, and mccabe
 
 License:          MIT
 URL:              https://gitlab.com/pycqa/flake8
 Source0:          https://files.pythonhosted.org/packages/source/f/%{modname}/%{modname}-%{version}.tar.gz
+# https://gitlab.com/pycqa/flake8/commit/0273ca561f0ad03adff41ce5d95a1ec31b10fe5a
+# https://gitlab.com/pycqa/flake8/commit/85c503de32f81ed9859d902cbe20eb4d2e4e8d55
+# https://gitlab.com/pycqa/flake8/commit/68782675b7f00c5d24c24e424efd1fbcb0705224
+# https://gitlab.com/pycqa/flake8/commit/ef1d5ceefcbfacf5dfe94534c4879ca814b130f0
+Patch0:           python-flake8-3.5.0-fix-pycodestyle24.patch
 
 BuildArch:        noarch
 
@@ -163,6 +168,9 @@ ln -s flake8-%{defaultpython} %{buildroot}%{_bindir}/flake8
 
 
 %changelog
+* Mon Jun  4 2018 Tom Callaway <spot@fedoraproject.org> - 3.5.0-3
+- apply upstream changes to use pycodestyle 2.4.0
+
 * Wed Feb 21 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.5.0-2
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)