Wed Mar 2 12:45:53 UTC 2016

This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch master
in repository python-flake8.

commit c5dc5985e1dfa87fa4fb4465b27912d1610579a7
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Wed Mar 2 13:45:12 2016 +0100

    * Cherry-pick Ubuntu changes
    * Add explicit dependency on setuptools. LP: #1509396.
    * python-flake8: (Build)-Depend on python-pep8 instead of pep8.
    * d/patches/py35-compat.patch: Added for Python 3.5 compatibility.
    * Merge from Debian testing. Remaining changes:
      - debian/rules: Run tests during package build.
      - debian/tests/tools: Call flake8 on some actual files (setup.py as a
        known-good one, and a synthetic one for a known-bad one) instead of
        without arguments on an empty directory.
    * debian/rules: Run tests during package build.
    * debian/tests/tools: Call flake8 on some actual files (setup.py as a
      known-good one, and a synthetic one for a known-bad one) instead of
      without arguments on an empty directory.
---
 debian/changelog   | 42 ++++++++++++++++++++++++++++++++++++++++--
 debian/control     | 13 ++++++++++---
 debian/rules       | 11 ++++++++++-
 debian/tests/tools |  1 -
 4 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5990199..5277ee1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ python-flake8 (2.5.4-1) unstable; urgency=medium
   * Depends on python-pyflakes/python3-pyflakes instead of pyflakes
     (Closes: #804741)
   * Run the test suite when building the package
+  * Cherry-pick Ubuntu changes
 
   [ Jackson Doak ]
   * debian/tests/tools: Call flake8 on some actual files (setup.py as a
@@ -15,17 +16,40 @@ python-flake8 (2.5.4-1) unstable; urgency=medium
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 01 Mar 2016 18:32:47 +0100
 
+python-flake8 (2.2.2-1ubuntu4) xenial; urgency=medium
+
+  * Add explicit dependency on setuptools. LP: #1509396.
+  * python-flake8: (Build)-Depend on python-pep8 instead of pep8.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 23 Oct 2015 17:42:39 +0200
+
+python-flake8 (2.2.2-1ubuntu2) wily; urgency=medium
+
+  * d/patches/py35-compat.patch: Added for Python 3.5 compatibility.
+
+ -- Barry Warsaw <barry at ubuntu.com>  Thu, 15 Oct 2015 16:56:34 -0400
+
+python-flake8 (2.2.2-1ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian testing. Remaining changes:
+    - debian/rules: Run tests during package build.
+    - debian/tests/tools: Call flake8 on some actual files (setup.py as a
+      known-good one, and a synthetic one for a known-bad one) instead of
+      without arguments on an empty directory.
+
+ -- Liam Young <liam.young at canonical.com>  Fri, 23 Jan 2015 17:50:41 +0000
+
 python-flake8 (2.2.2-1) unstable; urgency=medium
 
   * Team upload.
   * New upstream release
   * debian/control: update Standards-Version to 3.9.5.0 (no change)
-  * debian/rules: remove unused PY2_PACAKGE_NAME and PY3_PACKAGE_NAME 
+  * debian/rules: remove unused PY2_PACAKGE_NAME and PY3_PACKAGE_NAME
   * debian/control: change architecture to 'arch: all' since there are
     no binary or otherwise arch-specific executables in this package
   * debian/control: correct dependencies for python3-flake8 (python3-pep8
     instead of pep8, remove python3-flake8)
-  * debian/copyright: add current upstream maintainer copyright 
+  * debian/copyright: add current upstream maintainer copyright
   * debian/control: add Suggest: python-mock to python-flake8, this is
     required to run the tests
   * debian/tests/control: install python-mock to let tests run, note that
@@ -43,6 +67,20 @@ python-flake8 (2.1.0-2) unstable; urgency=medium
 
  -- Thomas Goirand <zigo at debian.org>  Sun, 13 Apr 2014 15:59:54 +0000
 
+python-flake8 (2.1.0-1ubuntu2) utopic; urgency=medium
+
+  * debian/rules: Run tests during package build.
+
+ -- Chuck Short <zulcss at ubuntu.com>  Fri, 25 Jul 2014 08:10:40 -0400
+
+python-flake8 (2.1.0-1ubuntu1) trusty; urgency=medium
+
+  * debian/tests/tools: Call flake8 on some actual files (setup.py as a
+    known-good one, and a synthetic one for a known-bad one) instead of
+    without arguments on an empty directory.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 24 Mar 2014 10:28:25 +0100
+
 python-flake8 (2.1.0-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 86fced0..29959fb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,17 @@ Build-Depends: debhelper (>= 9),
                pep8 (>= 1.5.7),
                python3-pyflakes (>= 0.8.1),
                python-all,
+               python-mccabe,
+               python-mock,
+               python-nose,
+               python-pep8 (>= 1.5.7),
                python-setuptools,
                python3-all,
                python3-mccabe (>= 0.2.1),
+               python3-mock,
+               python3-nose,
                python3-pep8 (>= 1.5.7),
-               python3-setuptools,
-               python-nose
+               python3-setuptools
 Standards-Version: 3.9.6
 Homepage: https://gitlab.com/pycqa/flake8
 Vcs-Git: git://anonscm.debian.org/python-modules/packages/python-flake8.git
@@ -24,7 +29,8 @@ XS-Testsuite: autopkgtest
 
 Package: python-flake8
 Architecture: all
-Depends: pep8 (>= 1.5.7),
+Depends: python-pep8 (>= 1.5.7),
+         python-setuptools,
          python-pyflakes (>= 0.8.1),
          python-mccabe (>= 0.2.1),
          ${misc:Depends},
@@ -41,6 +47,7 @@ Description: code checker using pep8 and pyflakes
 Package: python3-flake8
 Architecture: any
 Depends: python3-pep8 (>= 1.5.7),
+         python3-setuptools,
          python3-pyflakes (>= 0.8.1),
          python3-mccabe (>= 0.2.1),
          ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 9037939..27a610f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,12 @@ override_dh_auto_clean:
 	rm -rf build
 	dh_auto_clean
 
+override_dh_auto_test:
+	set -xe; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		$$py setup.py test; \
+	done
+
 override_dh_auto_build:
 	set -xe; \
 	for py in $(PYVERS) $(PY3VERS); do \
@@ -20,7 +26,10 @@ override_dh_auto_build:
 	rm -vf debian/*/usr/lib/python*/*-packages/*.egg-info/SOURCES.txt
 
 override_dh_auto_test:
-	nosetests
+	set -xe; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		$$py setup.py test; \
+	done
 
 override_dh_auto_install:
 	set -xe; \
diff --git a/debian/tests/tools b/debian/tests/tools
index 1b0c2c6..67aa758 100644
--- a/debian/tests/tools
+++ b/debian/tests/tools
@@ -1,7 +1,6 @@
 #!/bin/sh
 set -efu
 
-# setup.py should be clean
 flake8 setup.py
 
 # create a known-bad file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-flake8.git

