diff -Nru click-0.4.42+16.04.20151229/click/tests/integration/test_build_core_apps.py click-0.4.43+16.04.20160203/click/tests/integration/test_build_core_apps.py --- click-0.4.42+16.04.20151229/click/tests/integration/test_build_core_apps.py 2015-12-29 04:01:25.000000000 +0000 +++ click-0.4.43+16.04.20160203/click/tests/integration/test_build_core_apps.py 2016-02-12 18:16:47.000000000 +0000 @@ -20,7 +20,6 @@ import os import shutil import subprocess -import unittest from six import with_metaclass @@ -111,7 +110,7 @@ system_arch = subprocess.check_output( ["dpkg", "--print-architecture"], universal_newlines=True).strip() if system_arch not in ALLOW_ARCHITECTURES: - unittest.skip("%s has no armhf build support" % system_arch) + self.skipTest("%s has no armhf build support" % system_arch) # get and parse branch_dir = branch[len("lp:"):] build_dir = os.path.join(branch_dir, "build-tree") diff -Nru click-0.4.42+16.04.20151229/click/tests/integration/test_chroot.py click-0.4.43+16.04.20160203/click/tests/integration/test_chroot.py --- click-0.4.42+16.04.20151229/click/tests/integration/test_chroot.py 2015-12-29 04:01:25.000000000 +0000 +++ click-0.4.43+16.04.20160203/click/tests/integration/test_chroot.py 2016-02-12 18:16:47.000000000 +0000 @@ -16,6 +16,7 @@ """Integration tests for the click chroot feature.""" import subprocess +import unittest from .helpers import ( require_network, @@ -23,7 +24,21 @@ ClickTestCase, ) +# architectures present in 14.04 (current default framework) +ALLOW_ARCHITECTURES = [ + "amd64", "arm64", "armhf", "i386", "powerpc", "ppc64el"] + +def skipUnlessAllowedArchitecture(): + system_arch = subprocess.check_output( + ["dpkg", "--print-architecture"], universal_newlines=True).strip() + if system_arch in ALLOW_ARCHITECTURES: + return lambda func: func + else: + return unittest.skip("%s does not exist in 14.04") + + +@skipUnlessAllowedArchitecture() class TestChroot(ClickTestCase): @classmethod @@ -66,7 +81,8 @@ def test_exists_no(self): with self.assertRaises(subprocess.CalledProcessError): - subprocess.check_call(self.command("arch-that-does-not-exist")) + subprocess.check_call( + self.command("arch-that-does-not-exist", "exists")) class TestChrootName(TestChroot): diff -Nru click-0.4.42+16.04.20151229/debian/bzr-builder.manifest click-0.4.43+16.04.20160203/debian/bzr-builder.manifest --- click-0.4.42+16.04.20151229/debian/bzr-builder.manifest 2015-12-29 04:01:25.000000000 +0000 +++ click-0.4.43+16.04.20160203/debian/bzr-builder.manifest 2016-02-12 18:16:47.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~467 -lp:click revid:ci-train-bot@canonical.com-20151229013651-u2tlom09l6e810hk +# bzr-builder format 0.3 deb-version {debupstream}-0~606 +lp:click revid:cjwatson@canonical.com-20160212111043-o8iytqsywnz3mqaz diff -Nru click-0.4.42+16.04.20151229/debian/changelog click-0.4.43+16.04.20160203/debian/changelog --- click-0.4.42+16.04.20151229/debian/changelog 2015-12-29 04:01:25.000000000 +0000 +++ click-0.4.43+16.04.20160203/debian/changelog 2016-02-12 18:16:47.000000000 +0000 @@ -1,8 +1,35 @@ -click (0.4.42+16.04.20151229-0~467~ubuntu14.04.1) trusty; urgency=low +click (0.4.43+16.04.20160203-0~606~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Launchpad Package Builder Tue, 29 Dec 2015 04:01:25 +0000 + -- Launchpad Package Builder Fri, 12 Feb 2016 18:16:47 +0000 + +click (0.4.43+16.04.20160203-0ubuntu2) xenial; urgency=medium + + * Fix python3-click-package -> python3-click Replaces version + (LP: #1544776). + + -- Colin Watson Fri, 12 Feb 2016 11:10:43 +0000 + +click (0.4.43+16.04.20160203-0ubuntu1) xenial; urgency=medium + + [ Colin Watson ] + * Fix test skipping in build_core_apps integration tests. + * Skip chroot integration tests on architectures that were not present in + 14.04. + * Fix TestChroot.test_exists_no integration test to be more meaningful + rather than just testing a command syntax error. + * Rename python3-click back to its original name of python3-click-package + to get it out of the way of PyPI's "click" package, conflicting with + python3-click and python3-click-cli; this is unfortunate and + non-compliant with the Python policy, but from that point of view the + package that owns the name in the upstream packaging system ought to + win. + + [ CI Train Bot ] + * No-change rebuild. + + -- Colin Watson Wed, 03 Feb 2016 11:17:48 +0000 click (0.4.42+16.04.20151229-0ubuntu1) xenial; urgency=medium diff -Nru click-0.4.42+16.04.20151229/debian/control click-0.4.43+16.04.20160203/debian/control --- click-0.4.42+16.04.20151229/debian/control 2015-12-29 04:01:25.000000000 +0000 +++ click-0.4.43+16.04.20160203/debian/control 2016-02-12 18:16:47.000000000 +0000 @@ -13,7 +13,7 @@ Package: click Architecture: any Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-click (= ${binary:Version}), adduser +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-click-package (= ${binary:Version}), adduser Recommends: click-apparmor Suggests: click-reviewers-tools (>= 0.9), ubuntu-app-launch-tools | upstart-app-launch-tools Conflicts: click-package @@ -28,7 +28,7 @@ Package: click-dev Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${perl:Depends}, python3-click (= ${binary:Version}) +Depends: ${misc:Depends}, ${perl:Depends}, python3-click-package (= ${binary:Version}) Recommends: debootstrap, schroot, dpkg-dev Description: build Click packages Click is a simplified packaging format that installs in a separate part of @@ -36,13 +36,12 @@ . click-dev provides support for building these packages. -Package: python3-click +Package: python3-click-package Section: python Architecture: any Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-click-0.4 (= ${binary:Version}), gir1.2-glib-2.0, python3-apt, python3-debian, python3-gi -Conflicts: python3-click-package -Replaces: python3-click-package -Provides: python3-click-package +Conflicts: python3-click, python3-click-cli +Replaces: python3-click (<< 0.4.43) Description: Click packages (Python 3 interface) Click is a simplified packaging format that installs in a separate part of the file system, suitable for third-party applications. diff -Nru click-0.4.42+16.04.20151229/debian/python3-click.install click-0.4.43+16.04.20160203/debian/python3-click.install --- click-0.4.42+16.04.20151229/debian/python3-click.install 2015-12-29 04:01:25.000000000 +0000 +++ click-0.4.43+16.04.20160203/debian/python3-click.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python3 diff -Nru click-0.4.42+16.04.20151229/debian/python3-click-package.install click-0.4.43+16.04.20160203/debian/python3-click-package.install --- click-0.4.42+16.04.20151229/debian/python3-click-package.install 1970-01-01 00:00:00.000000000 +0000 +++ click-0.4.43+16.04.20160203/debian/python3-click-package.install 2016-02-12 18:16:47.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/python3