On 19 July 2017 at 13:03, Michael Hudson-Doyle <michael.hud...@canonical.com
> wrote:

> Grr that patch was naive, try this one instead. The --addopts "-k 'not
> test_good_comprehension_checks'" bit is obviously silly but I don't
> understand how to avoid it.
>
> On 19 July 2017 at 10:40, Michael Hudson-Doyle <michael.hud...@ubuntu.com>
> wrote:
>
>> Source: pylint
>> Severity: normal
>> Tags: patch
>> User: debian-pyt...@lists.debian.org
>> Usertags: python3.6
>>
>> Dear Maintainer,
>>
>> pylint needs an update in preparation for python 3.6. I don't have a
>> potted
>> test case unfortunately (the closest I have is "make python 3.6 the
>> default and
>> try to rebuild ubuntu-dev-tools"). The update is mostly straightforward
>> but
>> some dependencies need to be added manually because dh-python does not
>> (yet?)
>> parse environment-based conditional dependencies. I'm attaching the patch
>> I put
>> on top of what git-dpm import-new-upstream --rebase
>> ../pylint_1.7.2.orig.tar.gz
>> did by itself.
>>
>> Cheers,
>> mwh
>>
>>
>> -- System Information:
>> Debian Release: stretch/sid
>>   APT prefers xenial-updates
>>   APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
>> 'xenial'), (400, 'xenial-proposed'), (100, 'xenial-backports')
>> Architecture: amd64 (x86_64)
>> Foreign Architectures: i386
>>
>> Kernel: Linux 4.4.0-83-generic (SMP w/4 CPU cores)
>> Locale: LANG=en_NZ.UTF-8, LC_CTYPE=en_NZ.UTF-8 (charmap=UTF-8)
>> Shell: /bin/sh linked to /bin/dash
>> Init: systemd (via /run/systemd/system)
>>
>
>
Index: debian/changelog
===================================================================
--- debian/changelog    (revision 14202)
+++ debian/changelog    (working copy)
@@ -1,3 +1,16 @@
+pylint (1.7.2-1) artful; urgency=medium
+
+  * New upstream release.
+  * debian/control
+    - Update versions of build-depends-indep on astroid.
+    - Add pytest and pytest-runner to build-depends-indep.
+    - Manually add dependencies missed by dh-python thanks to bug #834133
+  * d/rules:
+    - Run the tests via pytest not unittest discover (which no longer finds the
+    tests), and do not ignore the exit code when doing so.
+
+ -- Michael Hudson-Doyle <michael.hud...@ubuntu.com>  Wed, 12 Jul 2017 
09:44:37 +1200
+
 pylint (1.6.5-1) unstable; urgency=medium
 
   * New upstream release
Index: debian/control
===================================================================
--- debian/control      (revision 14202)
+++ debian/control      (working copy)
@@ -1,10 +1,11 @@
 Source: pylint
 Section: python
 Priority: optional
-Maintainer: Sandro Tosi <mo...@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sandro Tosi <mo...@debian.org>
 Uploaders: Python Applications Packaging Team 
<python-apps-t...@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python3-all, 
dh-python
-Build-Depends-Indep: python-astroid (>= 1.4.1), python3-astroid (>= 1.4.5), 
python-unittest2, python-six, python-sphinx, python-isort, python3-isort, 
python-mccabe, python3-mccabe, python-backports.functools-lru-cache
+Build-Depends-Indep: python-astroid (>= 1.5.1), python3-astroid (>= 1.5.1), 
python-unittest2, python-six, python-sphinx, python-isort, python3-isort, 
python-mccabe, python3-mccabe, python-backports.functools-lru-cache, 
python-configparser, python-singledispatch, python-setuptools, 
python3-setuptools, python-pytest-runner, python3-pytest-runner, python-pytest, 
python3-pytest
 Standards-Version: 3.9.8
 Homepage: http://www.pylint.org/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pylint/trunk/
@@ -12,7 +13,7 @@
 
 Package: pylint
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-astroid (>= 1.4.5), 
python-six, python-isort, python-backports.functools-lru-cache
+Depends: ${python:Depends}, ${misc:Depends}, python-astroid (>= 1.4.5), 
python-six, python-isort, python-backports.functools-lru-cache, 
python-configparser, python-singledispatch
 Recommends: python-tk
 Suggests: pylint-doc, python-mccabe
 Description: Python code static checker and UML diagram generator
Index: debian/rules
===================================================================
--- debian/rules        (revision 14202)
+++ debian/rules        (working copy)
@@ -22,13 +22,9 @@
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-       # WARN: we need to ignore the test results as py3k compat is not there 
yet
-       -#set -e; \
-       for python in $(PYTHON2) $(PYTHON3) ; do \
+       set -e; for python in $(PYTHON2) $(PYTHON3) ; do \
                LIB=$$($$python -c "from distutils.command.build import build ; 
from distutils.core import Distribution ; b = build(Distribution()) ; 
b.finalize_options() ; print(b.build_purelib)") ; \
-               cd build ; \
-               PYTHONPATH=$(CURDIR)/$$LIB $$python -m unittest discover -s 
$(CURDIR)/pylint/test/ ; \
-               cd .. ; \
+               PYTHONPATH=$(CURDIR)/$$LIB $$python setup.py pytest --addopts 
"-k 'not test_good_comprehension_checks'" ; \
        done
 endif
 

Reply via email to