--- Begin Message ---
Package: src:python-apt
Version: 0.9.3.8
Tags: patch
User: debian-powerpc@lists.debian.org
Usertags: ppc64el
Hi,
This patch adds E129 to --ignore in 'tests/test_pep8.py', as pep8 1.5
introduced the following [1], and E125 was already there.
1.5 (2014-03-26)
Changes:
Report E129 instead of E125 for visually indented line with same indent
as next logical line. (Issue #126)
Thus fixing this test-suite error:
/«PKGBUILDDIR»/tests/../tests/old/test_enhances.py:14:21: E129 visually
indented line with same indent as next logical line
[...]
FAIL: test_pep8 (test_pep8.PackagePep8TestCase)
It can be seen currently on build logs of ppc64el [2] and s390, as these
archs
have attempted to build python-apt after Debian's pep8 moved from 1.4.6
to 1.5.7
(23 Jul):
pep8 (1.5.7-1) unstable; urgency=medium
[ David Watson ]
* New upstream release. (Closes: #754985)
[...]
-- David Watson <dwatson@debian.org> Wed, 23 Jul 2014 10:04:53 +0100
I'd think other archs would see this error too on a next build.
With the patch, the test pass successfully on python 2.7 and 3.4:
(sid-ppc64el-sbuild)$ python2.7 tests/test_all.py -v PackagePep8TestCase
[tests] Running on 2.7.8 (default, Aug 26 2014, 22:15:24) [GCC 4.9.1]
Using library_dir:
'/root/python-apt-0.9.3.8/build/lib.linux-ppc64le-2.7'test_pep8
(test_pep8.PackagePep8TestCase) ... ok
----------------------------------------------------------------------
Ran 1 test in 1.511s
OK
(sid-ppc64el-sbuild)$ python3.4 tests/test_all.py -v PackagePep8TestCase
[tests] Running on 3.4.1+ (default, Aug 21 2014, 11:23:41) [GCC 4.9.1]
Using library_dir:
'/root/python-apt-0.9.3.8/build/lib.linux-ppc64le-3.4'test_pep8
(test_pep8.PackagePep8TestCase) ... ok
----------------------------------------------------------------------
Ran 1 test in 1.526s
OK
Thanks.
P.S.: I'm debugging the other test failure too
(test_add_key_from_server_mitm),
in case you'd like to wait and make a single upload including both
fixes. That
should be submitted soon.
[1] https://pypi.python.org/pypi/pep8
[2]
https://buildd.debian.org/status/fetch.php?pkg=python-apt&arch=ppc64el&ver=0.9.3.8&stamp=1408742227
--
Mauricio Faria de Oliveira
IBM Linux Technology Center
diff -Nru python-apt-0.9.3.8/debian/changelog python-apt-0.9.3.8ppc64el1/debian/changelog
--- python-apt-0.9.3.8/debian/changelog 2014-06-30 08:32:24.000000000 -0300
+++ python-apt-0.9.3.8ppc64el1/debian/changelog 2014-08-27 16:15:14.000000000 -0300
@@ -1,3 +1,9 @@
+python-apt (0.9.3.8ppc64el1) UNRELEASED; urgency=medium
+
+ * tests/test_pep8.py: --ignore E129 too (fix FTBFS with pep8 >= 1.5)
+
+ -- Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com> Wed, 27 Aug 2014 16:09:14 -0300
+
python-apt (0.9.3.8) unstable; urgency=medium
* pep8 fixes to fix autopkgtest failure with the most recent
diff -Nru python-apt-0.9.3.8/tests/test_pep8.py python-apt-0.9.3.8ppc64el1/tests/test_pep8.py
--- python-apt-0.9.3.8/tests/test_pep8.py 2014-06-30 08:32:24.000000000 -0300
+++ python-apt-0.9.3.8ppc64el1/tests/test_pep8.py 2014-08-27 16:16:50.000000000 -0300
@@ -16,8 +16,10 @@
# E126 continuation line over-indented for hanging indent
# E127 continuation line over-indented for visual indent
# E128 continuation line under-indented for visual indent
+ # E129 continuation line does not distinguish itself from
+ # next logical line
# E265 block comment should start with '# '
- "--ignore=E125,E126,E127,E128,E265",
+ "--ignore=E125,E126,E127,E128,E129,E265",
"--exclude", "build,tests/old",
"--repeat", py_dir])
if res != 0:
--- End Message ---