Merge lp:~sergiusens/click/package-rename into lp:click

[Sergio Schvezov]

Rename the python package this installs from click to click_package.

[Sergio Schvezov (sergiusens)]

zesty test package https://launchpad.net/~sergiusens/+archive/ubuntu/ppa/+packages?field.name_filter=click&field.status_filter=published&field.series_filter=

[Sergio Schvezov (sergiusens)]

I can install click and python3-click in parallel with this change

[Kyle Fazzari (kyrofa)]

One question inline.

[Colin Watson (cjwatson)]

review: Needs Fixing

[Colin Watson (cjwatson)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-12-15 12:04:40 +0000
+++ .bzrignore	2017-06-07 11:34:17 +0000
@@ -30,10 +30,10 @@
 *.egg-info
 dist
 .tox
-click/paths.py
-click/tests/config.py
-click/tests/preload.gir
-click/tests/test_paths.py
+click_package/paths.py
+click_package/tests/config.py
+click_package/tests/preload.gir
+click_package/tests/test_paths.py
 build-aux/compile
 build-aux/config.guess
 build-aux/config.rpath
 
=== modified file 'Makefile.am'
--- Makefile.am	2014-06-30 16:48:31 +0000
+++ Makefile.am	2017-06-07 11:34:17 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = lib preload click conf debhelper init po schroot
+SUBDIRS = lib preload click_package conf debhelper init po schroot
 if PACKAGEKIT
 SUBDIRS += pk-plugin
 endif
 
=== modified file 'bin/click'
--- bin/click	2015-12-03 22:40:33 +0000
+++ bin/click	2017-06-07 11:34:17 +0000
@@ -34,7 +34,7 @@
 # There is an unfortunate name clash with
 # https://pypi.python.org/pypi/click; try to detect this and take evasive
 # action.
-import click
+import click_package as click
 if not getattr(click, "_CLICK_IS_A_PACKAGING_FORMAT_", None):
     import site
     wrong_click_mods = [
@@ -52,7 +52,7 @@
         sys.exit(1)
     del sys.path[user_site_index]
 
-from click import commands
+from click_package import commands
 
 
 def fix_stdout():
 
=== renamed directory 'click' => 'click_package'
=== modified file 'click_package/build.py'
--- click/build.py	2015-02-23 07:22:31 +0000
+++ click_package/build.py	2017-06-07 11:34:17 +0000
@@ -45,12 +45,12 @@
     # "click build" is required to work with only the Python standard library.
     pass
 
-from click import osextras
-from click.arfile import ArFile
-from click.preinst import static_preinst
-from click.versions import spec_version
+from click_package import osextras
+from click_package.arfile import ArFile
+from click_package.preinst import static_preinst
+from click_package.versions import spec_version
 
-from click.framework import (
+from click_package.framework import (
     validate_framework,
     ClickFrameworkInvalid,
 )
 
=== modified file 'click_package/commands/__init__.py'
--- click/commands/__init__.py	2014-05-20 09:03:05 +0000
+++ click_package/commands/__init__.py	2017-06-07 11:34:17 +0000
@@ -42,7 +42,7 @@
 
 
 def load_command(command):
-    return importlib.import_module("click.commands.%s" % command)
+    return importlib.import_module("click_package.commands.%s" % command)
 
 
 def help_text():
 
=== modified file 'click_package/commands/build.py'
--- click/commands/build.py	2015-02-24 12:19:11 +0000
+++ click_package/commands/build.py	2017-06-07 11:34:17 +0000
@@ -23,7 +23,7 @@
 import subprocess
 
 from gi.repository import Click
-from click.build import ClickBuildError, ClickBuilder
+from click_package.build import ClickBuildError, ClickBuilder
 
 
 def run(argv):
 
=== modified file 'click_package/commands/buildsource.py'
--- click/commands/buildsource.py	2015-02-26 17:01:45 +0000
+++ click_package/commands/buildsource.py	2017-06-07 11:34:17 +0000
@@ -21,7 +21,7 @@
 import os
 import sys
 
-from click.build import ClickBuildError, ClickSourceBuilder
+from click_package.build import ClickBuildError, ClickSourceBuilder
 
 
 def run(argv):
 
=== modified file 'click_package/commands/chroot.py'
--- click/commands/chroot.py	2015-05-01 07:28:16 +0000
+++ click_package/commands/chroot.py	2017-06-07 11:34:17 +0000
@@ -23,12 +23,12 @@
 from contextlib import contextmanager
 import os
 
-from click.chroot import (
+from click_package.chroot import (
     ClickChroot,
     ClickChrootAlreadyExistsException,
     ClickChrootDoesNotExistException,
 )
-from click import osextras
+from click_package import osextras
 
 
 def requires_root(parser):
 
=== modified file 'click_package/commands/desktophook.py'
--- click/commands/desktophook.py	2014-03-03 17:01:37 +0000
+++ click_package/commands/desktophook.py	2017-06-07 11:34:17 +0000
@@ -25,7 +25,7 @@
 
 from gi.repository import Click
 
-from click import osextras
+from click_package import osextras
 
 
 COMMENT = \
 
=== modified file 'click_package/commands/info.py'
--- click/commands/info.py	2014-10-07 08:56:03 +0000
+++ click_package/commands/info.py	2017-06-07 11:34:17 +0000
@@ -26,8 +26,8 @@
 
 from gi.repository import Click
 
-from click.install import DebFile
-from click.json_helpers import json_object_to_python
+from click_package.install import DebFile
+from click_package.json_helpers import json_object_to_python
 
 
 def _load_manifest(manifest_file):
 
=== modified file 'click_package/commands/install.py'
--- click/commands/install.py	2014-12-03 12:42:21 +0000
+++ click_package/commands/install.py	2017-06-07 11:34:17 +0000
@@ -23,7 +23,7 @@
 
 from gi.repository import Click
 
-from click.install import ClickInstaller, ClickInstallerError
+from click_package.install import ClickInstaller, ClickInstallerError
 
 
 def run(argv):
 
=== modified file 'click_package/commands/list.py'
--- click/commands/list.py	2014-04-03 08:52:02 +0000
+++ click_package/commands/list.py	2017-06-07 11:34:17 +0000
@@ -23,7 +23,7 @@
 
 from gi.repository import Click
 
-from click.json_helpers import json_array_to_python
+from click_package.json_helpers import json_array_to_python
 
 
 def list_packages(options):
 
=== modified file 'click_package/commands/verify.py'
--- click/commands/verify.py	2014-08-07 21:51:27 +0000
+++ click_package/commands/verify.py	2017-06-07 11:34:17 +0000
@@ -21,7 +21,7 @@
 
 from optparse import OptionParser
 
-from click.install import ClickInstaller
+from click_package.install import ClickInstaller
 
 
 def run(argv):
 
=== modified file 'click_package/framework.py'
--- click/framework.py	2015-02-18 09:17:29 +0000
+++ click_package/framework.py	2017-06-07 11:34:17 +0000
@@ -24,7 +24,7 @@
 except:
     pass
 
-import click.paths
+import click_package.paths
 
 
 class ClickFrameworkInvalid(Exception):
@@ -55,7 +55,7 @@
 
 # python version of vala get_frameworks_dir
 def get_frameworks_dir():
-    return click.paths.frameworks_dir
+    return click_package.paths.frameworks_dir
 
 
 def get_framework_path(framework_name):
 
=== modified file 'click_package/install.py'
--- click/install.py	2015-12-11 01:15:20 +0000
+++ click_package/install.py	2017-06-07 11:34:17 +0000
@@ -46,11 +46,11 @@
 from debian.debian_support import Version
 from gi.repository import Click
 
-from click.paths import preload_path
-from click.preinst import static_preinst_matches
-from click.versions import spec_version
+from click_package.paths import preload_path
+from click_package.preinst import static_preinst_matches
+from click_package.versions import spec_version
 
-from click.framework import (
+from click_package.framework import (
     validate_framework,
     ClickFrameworkInvalid,
 )
 
=== modified file 'click_package/tests/__init__.py'
--- click/tests/__init__.py	2014-06-09 14:21:26 +0000
+++ click_package/tests/__init__.py	2017-06-07 11:34:17 +0000
@@ -3,7 +3,7 @@
 import os
 import sys
 
-from click.tests import config
+from click_package.tests import config
 
 
 def _append_env_path(envname, value):
 
=== modified file 'click_package/tests/gimock.py'
--- click/tests/gimock.py	2016-08-28 00:39:05 +0000
+++ click_package/tests/gimock.py	2017-06-07 11:34:17 +0000
@@ -128,8 +128,8 @@
 except ImportError:
     import xml.etree.ElementTree as etree
 
-from click.tests.gimock_types import Stat, Stat64
-from click.tests import config, get_executable
+from click_package.tests.gimock_types import Stat, Stat64
+from click_package.tests import config, get_executable
 
 # Borrowed from giscanner.girparser.
 CORE_NS = "http://www.gtk.org/introspection/core/1.0"
@@ -269,7 +269,7 @@
             "unistd.h",
             ])
         preload_headers = set()
-        funcs = self._parse_gir("click/tests/preload.gir")
+        funcs = self._parse_gir("click_package/tests/preload.gir")
         for name, func in preloads.items():
             info = funcs[name]
             rpreloads.append([info, func])
 
=== modified file 'click_package/tests/gimock_types.py'
--- click/tests/gimock_types.py	2014-03-03 17:01:37 +0000
+++ click_package/tests/gimock_types.py	2017-06-07 11:34:17 +0000
@@ -17,7 +17,7 @@
 
 import ctypes
 
-from click.tests.config import (
+from click_package.tests.config import (
     STAT_OFFSET_GID,
     STAT_OFFSET_UID,
     STAT64_OFFSET_GID,
 
=== modified file 'click_package/tests/helpers.py'
--- click/tests/helpers.py	2014-10-02 06:57:37 +0000
+++ click_package/tests/helpers.py	2017-06-07 11:34:17 +0000
@@ -44,7 +44,7 @@
 
 from gi.repository import Click, GLib
 
-from click.tests import gimock
+from click_package.tests import gimock
 
 
 def disable_logging(func):
@@ -154,7 +154,7 @@
     def _create_mock_framework_dir(self, frameworks_dir=None):
         if frameworks_dir is None:
             frameworks_dir = os.path.join(self.temp_dir, "frameworks")
-            patcher = mock.patch('click.paths.frameworks_dir', frameworks_dir)
+            patcher = mock.patch('click_package.paths.frameworks_dir', frameworks_dir)
             patcher.start()
             self.addCleanup(patcher.stop)
         Click.ensuredir(frameworks_dir)
 
=== modified file 'click_package/tests/integration/test_signatures.py'
--- click/tests/integration/test_signatures.py	2016-09-16 17:41:30 +0000
+++ click_package/tests/integration/test_signatures.py	2017-06-07 11:34:17 +0000
@@ -24,7 +24,7 @@
 
 import apt
 
-from click import osextras
+from click_package import osextras
 from .helpers import (
     require_root,
     ClickTestCase,
 
=== modified file 'click_package/tests/integration/test_verify.py'
--- click/tests/integration/test_verify.py	2014-09-04 14:15:08 +0000
+++ click_package/tests/integration/test_verify.py	2017-06-07 11:34:17 +0000
@@ -50,7 +50,7 @@
                  path_to_click],
                 universal_newlines=True, stderr=subprocess.STDOUT)
         expected_error = (
-            'click.framework.ClickFrameworkInvalid: Framework '
+            'click_package.framework.ClickFrameworkInvalid: Framework '
             '"missing" not present on system (use '
             '--force-missing-framework option to override)')
         self.assertIn(expected_error, cm.exception.output)
@@ -66,7 +66,8 @@
                  path_to_click],
                 universal_newlines=True, stderr=subprocess.STDOUT)
         expected_error = (
-            'click.install.DebsigVerifyError: Signature verification error: '
+            'click_package.install.DebsigVerifyError: '
+            'Signature verification error: '
             'debsig: %s does not appear to be a deb format package'
         ) % path_to_click
         self.assertIn(expected_error, cm.exception.output)
 
=== modified file 'click_package/tests/test_arfile.py'
--- click/tests/test_arfile.py	2013-06-27 14:30:15 +0000
+++ click_package/tests/test_arfile.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.arfile."""
+"""Unit tests for click_package.arfile."""
 
 from __future__ import print_function
 
@@ -26,8 +26,8 @@
 import os
 import subprocess
 
-from click.arfile import ArFile
-from click.tests.helpers import TestCase, touch
+from click_package.arfile import ArFile
+from click_package.tests.helpers import TestCase, touch
 
 
 class TestArFile(TestCase):
 
=== modified file 'click_package/tests/test_build.py'
--- click/tests/test_build.py	2015-02-23 07:23:39 +0000
+++ click_package/tests/test_build.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.build."""
+"""Unit tests for click_package.build."""
 
 from __future__ import print_function
 
@@ -31,9 +31,9 @@
 import tarfile
 from textwrap import dedent
 
-from click.build import ClickBuildError, ClickBuilder, ClickSourceBuilder
-from click.preinst import static_preinst
-from click.tests.helpers import (
+from click_package.build import ClickBuildError, ClickBuilder, ClickSourceBuilder
+from click_package.preinst import static_preinst
+from click_package.tests.helpers import (
     disable_logging,
     mkfile,
     TestCase,
 
=== modified file 'click_package/tests/test_chroot.py'
--- click/tests/test_chroot.py	2015-12-29 01:12:58 +0000
+++ click_package/tests/test_chroot.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.chroot."""
+"""Unit tests for click_package.chroot."""
 
 from __future__ import print_function
 
@@ -26,12 +26,12 @@
 import re
 from textwrap import dedent
 
-from click.chroot import (
+from click_package.chroot import (
     ClickChroot,
     generate_sources,
     strip_dev_series_from_framework,
 )
-from click.tests.helpers import TestCase, mock
+from click_package.tests.helpers import TestCase, mock
 
 
 class FakeClickChroot(ClickChroot):
 
=== modified file 'click_package/tests/test_database.py'
--- click/tests/test_database.py	2015-10-15 11:47:35 +0000
+++ click_package/tests/test_database.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.database."""
+"""Unit tests for click_package.database."""
 
 from __future__ import print_function
 
@@ -34,9 +34,9 @@
 from gi.repository import Click, GLib
 from six import integer_types
 
-from click.json_helpers import json_array_to_python, json_object_to_python
-from click.tests.gimock_types import Passwd
-from click.tests.helpers import TestCase, mkfile, touch
+from click_package.json_helpers import json_array_to_python, json_object_to_python
+from click_package.tests.gimock_types import Passwd
+from click_package.tests.helpers import TestCase, mkfile, touch
 
 
 class TestClickInstalledPackage(TestCase):
 
=== modified file 'click_package/tests/test_framework.py'
--- click/tests/test_framework.py	2014-07-09 12:56:21 +0000
+++ click_package/tests/test_framework.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.framework."""
+"""Unit tests for click_package.framework."""
 
 from __future__ import print_function
 
@@ -27,7 +27,7 @@
 
 from gi.repository import Click
 
-from click.tests.helpers import TestCase, touch
+from click_package.tests.helpers import TestCase, touch
 
 
 class TestClickFramework(TestCase):
 
=== modified file 'click_package/tests/test_hooks.py'
--- click/tests/test_hooks.py	2016-08-28 00:41:18 +0000
+++ click_package/tests/test_hooks.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.hooks."""
+"""Unit tests for click_package.hooks."""
 
 from __future__ import print_function
 
@@ -35,8 +35,8 @@
 
 from gi.repository import Click, GLib
 
-from click.tests.gimock_types import Passwd
-from click.tests.helpers import TestCase, mkfile, mkfile_utf8
+from click_package.tests.gimock_types import Passwd
+from click_package.tests.helpers import TestCase, mkfile, mkfile_utf8
 
 
 class TestClickPatternFormatter(TestCase):
 
=== modified file 'click_package/tests/test_install.py'
--- click/tests/test_install.py	2015-12-11 01:15:20 +0000
+++ click_package/tests/test_install.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.install."""
+"""Unit tests for click_package.install."""
 
 from __future__ import print_function
 
@@ -40,22 +40,22 @@
 from debian.deb822 import Deb822
 from gi.repository import Click
 
-from click.arfile import ArFile
-from click.build import ClickBuilder
-from click.install import (
+from click_package.arfile import ArFile
+from click_package.build import ClickBuilder
+from click_package.install import (
     ClickInstaller,
     ClickInstallerAuditError,
     ClickInstallerPermissionDenied,
 )
-from click.preinst import static_preinst
-from click.tests.helpers import (
+from click_package.preinst import static_preinst
+from click_package.tests.helpers import (
     disable_logging,
     mkfile,
     mock,
     TestCase,
     touch,
 )
-from click.versions import spec_version
+from click_package.versions import spec_version
 
 
 @contextmanager
@@ -82,7 +82,7 @@
         self.db = Click.DB()
         self.db.add(self.temp_dir)
         # mock signature checks during the tests
-        self.debsig_patcher = mock.patch("click.install.DebsigVerify")
+        self.debsig_patcher = mock.patch("click_package.install.DebsigVerify")
         self.debsig_patcher.start()
 
     def tearDown(self):
@@ -652,7 +652,7 @@
         os.path.exists(ClickInstaller(None)._preload_path()),
         "preload bits not built; installing packages will fail")
     @mock.patch("gi.repository.Click.package_install_hooks")
-    @mock.patch("click.install.ClickInstaller._dpkg_architecture")
+    @mock.patch("click_package.install.ClickInstaller._dpkg_architecture")
     def test_single_architecture(self, mock_dpkg_architecture,
                                  mock_package_install_hooks):
         with self.run_in_subprocess(
@@ -689,7 +689,7 @@
         os.path.exists(ClickInstaller(None)._preload_path()),
         "preload bits not built; installing packages will fail")
     @mock.patch("gi.repository.Click.package_install_hooks")
-    @mock.patch("click.install.ClickInstaller._dpkg_architecture")
+    @mock.patch("click_package.install.ClickInstaller._dpkg_architecture")
     def test_multiple_architectures(self, mock_dpkg_architecture,
                                     mock_package_install_hooks):
         with self.run_in_subprocess(
 
=== modified file 'click_package/tests/test_osextras.py'
--- click/tests/test_osextras.py	2014-07-09 12:56:21 +0000
+++ click_package/tests/test_osextras.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.osextras."""
+"""Unit tests for click_package.osextras."""
 
 from __future__ import print_function
 __all__ = [
@@ -26,8 +26,8 @@
 
 from gi.repository import Click, GLib
 
-from click import osextras
-from click.tests.helpers import TestCase, mock, touch
+from click_package import osextras
+from click_package.tests.helpers import TestCase, mock, touch
 
 
 class TestOSExtrasBaseMixin:
 
=== modified file 'click_package/tests/test_paths.py.in'
--- click/tests/test_paths.py.in	2014-07-09 12:56:21 +0000
+++ click_package/tests/test_paths.py.in	2017-06-07 11:34:17 +0000
@@ -28,7 +28,7 @@
 
 from gi.repository import Click
 
-from click.tests.helpers import TestCase
+from click_package.tests.helpers import TestCase
 
 
 class TestClickPaths(TestCase):
 
=== modified file 'click_package/tests/test_query.py'
--- click/tests/test_query.py	2014-03-03 21:43:10 +0000
+++ click_package/tests/test_query.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.query."""
+"""Unit tests for click_package.query."""
 
 from __future__ import print_function
 __all__ = [
@@ -25,7 +25,7 @@
 
 from gi.repository import Click
 
-from click.tests.helpers import TestCase, touch
+from click_package.tests.helpers import TestCase, touch
 
 
 class TestQuery(TestCase):
 
=== modified file 'click_package/tests/test_scripts.py'
--- click/tests/test_scripts.py	2013-06-27 14:30:15 +0000
+++ click_package/tests/test_scripts.py	2017-06-07 11:34:17 +0000
@@ -24,7 +24,7 @@
 import subprocess
 from unittest import skipIf
 
-from click.tests.helpers import TestCase
+from click_package.tests.helpers import TestCase
 
 
 class TestScripts(TestCase):
 
=== modified file 'click_package/tests/test_static.py'
--- click/tests/test_static.py	2013-06-27 14:30:15 +0000
+++ click_package/tests/test_static.py	2017-06-07 11:34:17 +0000
@@ -41,13 +41,13 @@
     pyflakes = None
 
 
-from click.tests.helpers import TestCase
+from click_package.tests.helpers import TestCase
 
 
 class TestStatic(TestCase):
     def all_paths(self):
         paths = []
-        start_dir = os.path.dirname(resource_filename('click', '__init__.py'))
+        start_dir = os.path.dirname(resource_filename('click_package', '__init__.py'))
         for dirpath, dirnames, filenames in os.walk(start_dir):
             for ignore in ('doc', ".bzr", "__pycache__"):
                 if ignore in dirnames:
 
=== modified file 'click_package/tests/test_user.py'
--- click/tests/test_user.py	2014-10-02 06:57:37 +0000
+++ click_package/tests/test_user.py	2017-06-07 11:34:17 +0000
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Unit tests for click.user."""
+"""Unit tests for click_package.user."""
 
 from __future__ import print_function
 
@@ -30,9 +30,9 @@
 
 from gi.repository import Click, GLib
 
-from click.json_helpers import json_array_to_python, json_object_to_python
-from click.tests.gimock_types import Passwd
-from click.tests.helpers import (
+from click_package.json_helpers import json_array_to_python, json_object_to_python
+from click_package.tests.gimock_types import Passwd
+from click_package.tests.helpers import (
     TestCase,
     make_installed_click,
     mkfile,
 
=== modified file 'configure.ac'
--- configure.ac	2014-06-30 16:48:31 +0000
+++ configure.ac	2017-06-07 11:34:17 +0000
@@ -131,9 +131,9 @@
 
 AC_CONFIG_FILES([
 	Makefile
-	click/Makefile
-	click/tests/Makefile
-	click/tests/config.py
+	click_package/Makefile
+	click_package/tests/Makefile
+	click_package/tests/config.py
 	conf/Makefile
 	conf/databases/Makefile
 	conf/databases/99_default.conf
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-09-16 17:46:25 +0000
+++ debian/changelog	2017-06-07 11:34:17 +0000
@@ -1,3 +1,10 @@
+click (0.4.46-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Rename the python package this installs from click to click_package.
+    (LP: #1693226)
+
+ -- Sergio Schvezov <[e-mail]>  Fri, 26 May 2017 13:03:44 -0300
+
 click (0.4.45.1+16.10.20160916-0ubuntu1) yakkety; urgency=medium
 
   * Kill gpg-agent (if possible) after running debsigs in integration tests.
 
=== modified file 'debian/control'
--- debian/control	2016-08-28 20:59:24 +0000
+++ debian/control	2017-06-07 11:34:17 +0000
@@ -40,7 +40,6 @@
 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, 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
 
=== modified file 'debian/tests/run-tests.sh'
--- debian/tests/run-tests.sh	2016-08-10 12:33:34 +0000
+++ debian/tests/run-tests.sh	2017-06-07 11:34:17 +0000
@@ -10,4 +10,4 @@
         --with-systemduserunitdir=/usr/lib/systemd/user \
         --disable-packagekit
 
-TEST_INTEGRATION=1 python3 -m unittest discover -vv click.tests.integration
+TEST_INTEGRATION=1 python3 -m unittest discover -vv click_package.tests.integration
 
=== modified file 'doc/index.rst'
--- doc/index.rst	2015-05-01 07:28:16 +0000
+++ doc/index.rst	2017-06-07 11:34:17 +0000
@@ -84,11 +84,11 @@
 
 To run a specific testcase, use the standard python unittest syntax like::
 
-  $ python3 -m unittest click.tests.test_install
+  $ python3 -m unittest click_package.tests.test_install
 
 or::
 
-  $ python2 -m unittest click.tests.test_build.TestClickBuilder.test_build
+  $ python2 -m unittest click_package.tests.test_build.TestClickBuilder.test_build
 
 Test coverage
 -------------
@@ -130,7 +130,7 @@
     GI_TYPELIB_PATH=$(pwd)/lib/click \
     CLICK_BINARY=$(pwd)/bin/click \
     TEST_INTEGRATION=1 \
-    python3 -m unittest discover click.tests.integration
+    python3 -m unittest discover click_package.tests.integration
 
 to run against the build tree.
 
 
=== modified file 'setup.py.in'
--- setup.py.in	2014-06-30 16:48:31 +0000
+++ setup.py.in	2017-06-07 11:34:17 +0000
@@ -29,7 +29,7 @@
             coverage_executable = "python3-coverage"
             self.spawn([
                 coverage_executable, "run", "-m", "unittest",
-                "discover", "-vv", "click.tests"])
+                "discover", "-vv", "click_package.tests"])
             self.spawn([coverage_executable, "combine"])
             self.spawn([
                 coverage_executable, "xml", "-o", "coverage-python.xml"])
@@ -49,5 +49,5 @@
     scripts=['bin/click'],
     install_requires=requirements,
     cmdclass={"test": test_extra},
-    test_suite="click.tests",
+    test_suite="click_package.tests",
     )
 
=== modified file 'tox.ini'
--- tox.ini	2014-03-03 12:44:14 +0000
+++ tox.ini	2017-06-07 11:34:17 +0000
@@ -1,6 +1,6 @@
 [tox]
-envlist = py27,py32,py33,py34
+envlist = py27,py32,py33,py34,py35,py36
 
 [testenv]
-commands = python -m unittest discover -vv click.tests
+commands = python -m unittest discover -vv click_package.tests
 sitepackages = True