[packages/python-pycodestyle] - added py3.7 patch (fixes tests with python3.7; note: changes output for async keyword)

qboosh qboosh at pld-linux.org
Sun Jul 22 10:42:36 CEST 2018


commit 797472828baa216a52ef0bfc1fb43992b74cc0fd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 22 10:44:32 2018 +0200

    - added py3.7 patch (fixes tests with python3.7; note: changes output for async keyword)

 python-pycodestyle-py3.7.patch | 52 ++++++++++++++++++++++++++++++++++++++++++
 python-pycodestyle.spec        | 10 ++++----
 2 files changed, 58 insertions(+), 4 deletions(-)
---
diff --git a/python-pycodestyle.spec b/python-pycodestyle.spec
index 0947cd2..efa012b 100644
--- a/python-pycodestyle.spec
+++ b/python-pycodestyle.spec
@@ -16,17 +16,20 @@ Group:		Libraries/Python
 #Source0Download: https://pypi.python.org/simple/pycodestyle/
 Source0:	https://files.pythonhosted.org/packages/source/p/pycodestyle/pycodestyle-%{version}.tar.gz
 # Source0-md5:	240e342756af30cae0983b16303a2055
+Patch0:		%{name}-py3.7.patch
 URL:		https://pycodestyle.readthedocs.io/
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
 %if %{with python2}
+BuildRequires:	python-modules >= 1:2.6
 BuildRequires:	python-setuptools
 %endif
 %if %{with python3}
+BuildRequires:	python3-modules >= 1:3.2
 BuildRequires:	python3-setuptools
 %endif
 %{?with_doc:BuildRequires:	sphinx-pdg}
-Requires:	python-modules
+Requires:	python-modules >= 1:2.6
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,7 +46,7 @@ wcześniej nazywał się pep8.
 Summary:	Python style guide checker
 Summary(pl.UTF-8):	Sprawdzanie zgodności z poradnikiem stylu kodowania w Pythonie
 Group:		Libraries/Python
-Requires:	python3-modules
+Requires:	python3-modules >= 1:3.2
 
 %description -n python3-pycodestyle
 pycodestyle is a tool to check your Python code against some of the
@@ -67,6 +70,7 @@ Dokumentacja API modułu pycodestyle.
 
 %prep
 %setup -q -n pycodestyle-%{version}
+%patch0 -p1
 
 %build
 %if %{with python2}
@@ -109,10 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pycodestyle
 %attr(755,root,root) %{_bindir}/pycodestyle-2
 %{py_sitescriptdir}/pycodestyle.py[co]
-%if "%{py_ver}" > "2.4"
 %{py_sitescriptdir}/pycodestyle-%{version}-py*.egg-info
 %endif
-%endif
 
 %if %{with python3}
 %files -n python3-pycodestyle
diff --git a/python-pycodestyle-py3.7.patch b/python-pycodestyle-py3.7.patch
new file mode 100644
index 0000000..26c8abc
--- /dev/null
+++ b/python-pycodestyle-py3.7.patch
@@ -0,0 +1,52 @@
+--- pycodestyle-2.3.1/pycodestyle.py.orig	2017-01-31 00:57:04.000000000 +0100
++++ pycodestyle-2.3.1/pycodestyle.py	2018-07-22 10:20:35.053176323 +0200
+@@ -91,7 +91,7 @@
+ 
+ PyCF_ONLY_AST = 1024
+ SINGLETONS = frozenset(['False', 'None', 'True'])
+-KEYWORDS = frozenset(keyword.kwlist + ['print']) - SINGLETONS
++KEYWORDS = frozenset(keyword.kwlist + ['print', 'async']) - SINGLETONS
+ UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-'])
+ ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-'])
+ WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%'])
+@@ -110,7 +110,7 @@
+ RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,.*,\s*\w+\s*$')
+ ERRORCODE_REGEX = re.compile(r'\b[A-Z]\d{3}\b')
+ DOCSTRING_REGEX = re.compile(r'u?r?["\']')
+-EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]')
++EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[\[({] | [\]}),;:]')
+ WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?:  |\t)')
+ COMPARE_SINGLETON_REGEX = re.compile(r'(\bNone|\bFalse|\bTrue)?\s*([=!]=)'
+                                      r'\s*(?(1)|(None|False|True))\b')
+--- pycodestyle-2.3.1/testsuite/E25.py.orig	2018-07-22 10:30:36.083169457 +0200
++++ pycodestyle-2.3.1/testsuite/E25.py	2018-07-22 10:30:41.713169396 +0200
+@@ -39,6 +39,6 @@
+ async def add(a: int = 0, b: int = 0) -> int:
+     return a + b
+ # Previously E251 four times
+-#: E272:1:6
++#: E271:1:6
+ async  def add(a: int = 0, b: int = 0) -> int:
+     return a + b
+--- pycodestyle-2.3.1/testsuite/E30.py.orig	2017-01-25 00:13:11.000000000 +0100
++++ pycodestyle-2.3.1/testsuite/E30.py	2018-07-22 10:31:24.909835554 +0200
+@@ -157,7 +157,7 @@
+ if __name__ == '__main__':
+     main()
+ # Previously just E272:1:6 E272:4:6
+-#: E302:4:1 E272:1:6 E272:4:6
++#: E302:4:1 E271:1:6 E271:4:6
+ async  def x():
+     pass
+ 
+--- pycodestyle-2.3.1/testsuite/E70.py.orig	2017-01-25 00:13:11.000000000 +0100
++++ pycodestyle-2.3.1/testsuite/E70.py	2018-07-22 10:31:53.633168572 +0200
+@@ -14,7 +14,7 @@
+ def f(x): return 2
+ #: E704:1:1
+ async def f(x): return 2
+-#: E704:1:1 E272:1:6
++#: E704:1:1 E271:1:6
+ async  def f(x): return 2
+ #: E704:1:1 E226:1:19
+ def f(x): return 2*x
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pycodestyle.git/commitdiff/797472828baa216a52ef0bfc1fb43992b74cc0fd



More information about the pld-cvs-commit mailing list