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

Proposed by Sergio Schvezov on 2017-05-26
Status: Merged
Approved by: Michael Vogt on 2017-06-07
Approved revision: 626
Merged at revision: 620
Proposed branch: lp:~sergiusens/click/package-rename
Merge into: lp:click
Diff against target: 799 lines (+100/-93)
41 files modified
.bzrignore (+4/-4)
Makefile.am (+1/-1)
bin/click (+2/-2)
click_package/build.py (+5/-5)
click_package/commands/__init__.py (+1/-1)
click_package/commands/build.py (+1/-1)
click_package/commands/buildsource.py (+1/-1)
click_package/commands/chroot.py (+2/-2)
click_package/commands/desktophook.py (+1/-1)
click_package/commands/info.py (+2/-2)
click_package/commands/install.py (+1/-1)
click_package/commands/list.py (+1/-1)
click_package/commands/verify.py (+1/-1)
click_package/framework.py (+2/-2)
click_package/install.py (+4/-4)
click_package/tests/__init__.py (+1/-1)
click_package/tests/gimock.py (+3/-3)
click_package/tests/gimock_types.py (+1/-1)
click_package/tests/helpers.py (+2/-2)
click_package/tests/integration/test_signatures.py (+1/-1)
click_package/tests/integration/test_verify.py (+3/-2)
click_package/tests/test_arfile.py (+3/-3)
click_package/tests/test_build.py (+4/-4)
click_package/tests/test_chroot.py (+3/-3)
click_package/tests/test_database.py (+4/-4)
click_package/tests/test_framework.py (+2/-2)
click_package/tests/test_hooks.py (+3/-3)
click_package/tests/test_install.py (+10/-10)
click_package/tests/test_osextras.py (+3/-3)
click_package/tests/test_paths.py.in (+1/-1)
click_package/tests/test_query.py (+2/-2)
click_package/tests/test_scripts.py (+1/-1)
click_package/tests/test_static.py (+2/-2)
click_package/tests/test_user.py (+4/-4)
configure.ac (+3/-3)
debian/changelog (+7/-0)
debian/control (+0/-1)
debian/tests/run-tests.sh (+1/-1)
doc/index.rst (+3/-3)
setup.py.in (+2/-2)
tox.ini (+2/-2)
To merge this branch: bzr merge lp:~sergiusens/click/package-rename
Reviewer Review Type Date Requested Status
Colin Watson 2017-05-26 Approve on 2017-06-01
Review via email: mp+324689@code.launchpad.net

Description of the change

Rename the python package this installs from click to click_package.

To post a comment you must log in.
Sergio Schvezov (sergiusens) wrote :

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

Kyle Fazzari (kyrofa) wrote :

One question inline.

Colin Watson (cjwatson) :
review: Needs Fixing
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2015-12-15 12:04:40 +0000
+++ .bzrignore 2017-06-07 11:34:17 +0000
@@ -30,10 +30,10 @@
30*.egg-info30*.egg-info
31dist31dist
32.tox32.tox
33click/paths.py33click_package/paths.py
34click/tests/config.py34click_package/tests/config.py
35click/tests/preload.gir35click_package/tests/preload.gir
36click/tests/test_paths.py36click_package/tests/test_paths.py
37build-aux/compile37build-aux/compile
38build-aux/config.guess38build-aux/config.guess
39build-aux/config.rpath39build-aux/config.rpath
4040
=== 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 @@
1SUBDIRS = lib preload click conf debhelper init po schroot1SUBDIRS = lib preload click_package conf debhelper init po schroot
2if PACKAGEKIT2if PACKAGEKIT
3SUBDIRS += pk-plugin3SUBDIRS += pk-plugin
4endif4endif
55
=== 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 @@
34# There is an unfortunate name clash with34# There is an unfortunate name clash with
35# https://pypi.python.org/pypi/click; try to detect this and take evasive35# https://pypi.python.org/pypi/click; try to detect this and take evasive
36# action.36# action.
37import click37import click_package as click
38if not getattr(click, "_CLICK_IS_A_PACKAGING_FORMAT_", None):38if not getattr(click, "_CLICK_IS_A_PACKAGING_FORMAT_", None):
39 import site39 import site
40 wrong_click_mods = [40 wrong_click_mods = [
@@ -52,7 +52,7 @@
52 sys.exit(1)52 sys.exit(1)
53 del sys.path[user_site_index]53 del sys.path[user_site_index]
5454
55from click import commands55from click_package import commands
5656
5757
58def fix_stdout():58def fix_stdout():
5959
=== 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 @@
45 # "click build" is required to work with only the Python standard library.45 # "click build" is required to work with only the Python standard library.
46 pass46 pass
4747
48from click import osextras48from click_package import osextras
49from click.arfile import ArFile49from click_package.arfile import ArFile
50from click.preinst import static_preinst50from click_package.preinst import static_preinst
51from click.versions import spec_version51from click_package.versions import spec_version
5252
53from click.framework import (53from click_package.framework import (
54 validate_framework,54 validate_framework,
55 ClickFrameworkInvalid,55 ClickFrameworkInvalid,
56)56)
5757
=== 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 @@
4242
4343
44def load_command(command):44def load_command(command):
45 return importlib.import_module("click.commands.%s" % command)45 return importlib.import_module("click_package.commands.%s" % command)
4646
4747
48def help_text():48def help_text():
4949
=== 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 @@
23import subprocess23import subprocess
2424
25from gi.repository import Click25from gi.repository import Click
26from click.build import ClickBuildError, ClickBuilder26from click_package.build import ClickBuildError, ClickBuilder
2727
2828
29def run(argv):29def run(argv):
3030
=== 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 @@
21import os21import os
22import sys22import sys
2323
24from click.build import ClickBuildError, ClickSourceBuilder24from click_package.build import ClickBuildError, ClickSourceBuilder
2525
2626
27def run(argv):27def run(argv):
2828
=== 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 @@
23from contextlib import contextmanager23from contextlib import contextmanager
24import os24import os
2525
26from click.chroot import (26from click_package.chroot import (
27 ClickChroot,27 ClickChroot,
28 ClickChrootAlreadyExistsException,28 ClickChrootAlreadyExistsException,
29 ClickChrootDoesNotExistException,29 ClickChrootDoesNotExistException,
30)30)
31from click import osextras31from click_package import osextras
3232
3333
34def requires_root(parser):34def requires_root(parser):
3535
=== 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 @@
2525
26from gi.repository import Click26from gi.repository import Click
2727
28from click import osextras28from click_package import osextras
2929
3030
31COMMENT = \31COMMENT = \
3232
=== 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 @@
2626
27from gi.repository import Click27from gi.repository import Click
2828
29from click.install import DebFile29from click_package.install import DebFile
30from click.json_helpers import json_object_to_python30from click_package.json_helpers import json_object_to_python
3131
3232
33def _load_manifest(manifest_file):33def _load_manifest(manifest_file):
3434
=== 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 @@
2323
24from gi.repository import Click24from gi.repository import Click
2525
26from click.install import ClickInstaller, ClickInstallerError26from click_package.install import ClickInstaller, ClickInstallerError
2727
2828
29def run(argv):29def run(argv):
3030
=== 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 @@
2323
24from gi.repository import Click24from gi.repository import Click
2525
26from click.json_helpers import json_array_to_python26from click_package.json_helpers import json_array_to_python
2727
2828
29def list_packages(options):29def list_packages(options):
3030
=== 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 @@
2121
22from optparse import OptionParser22from optparse import OptionParser
2323
24from click.install import ClickInstaller24from click_package.install import ClickInstaller
2525
2626
27def run(argv):27def run(argv):
2828
=== 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 @@
24except:24except:
25 pass25 pass
2626
27import click.paths27import click_package.paths
2828
2929
30class ClickFrameworkInvalid(Exception):30class ClickFrameworkInvalid(Exception):
@@ -55,7 +55,7 @@
5555
56# python version of vala get_frameworks_dir56# python version of vala get_frameworks_dir
57def get_frameworks_dir():57def get_frameworks_dir():
58 return click.paths.frameworks_dir58 return click_package.paths.frameworks_dir
5959
6060
61def get_framework_path(framework_name):61def get_framework_path(framework_name):
6262
=== 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 @@
46from debian.debian_support import Version46from debian.debian_support import Version
47from gi.repository import Click47from gi.repository import Click
4848
49from click.paths import preload_path49from click_package.paths import preload_path
50from click.preinst import static_preinst_matches50from click_package.preinst import static_preinst_matches
51from click.versions import spec_version51from click_package.versions import spec_version
5252
53from click.framework import (53from click_package.framework import (
54 validate_framework,54 validate_framework,
55 ClickFrameworkInvalid,55 ClickFrameworkInvalid,
56)56)
5757
=== 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 @@
3import os3import os
4import sys4import sys
55
6from click.tests import config6from click_package.tests import config
77
88
9def _append_env_path(envname, value):9def _append_env_path(envname, value):
1010
=== 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 @@
128except ImportError:128except ImportError:
129 import xml.etree.ElementTree as etree129 import xml.etree.ElementTree as etree
130130
131from click.tests.gimock_types import Stat, Stat64131from click_package.tests.gimock_types import Stat, Stat64
132from click.tests import config, get_executable132from click_package.tests import config, get_executable
133133
134# Borrowed from giscanner.girparser.134# Borrowed from giscanner.girparser.
135CORE_NS = "http://www.gtk.org/introspection/core/1.0"135CORE_NS = "http://www.gtk.org/introspection/core/1.0"
@@ -269,7 +269,7 @@
269 "unistd.h",269 "unistd.h",
270 ])270 ])
271 preload_headers = set()271 preload_headers = set()
272 funcs = self._parse_gir("click/tests/preload.gir")272 funcs = self._parse_gir("click_package/tests/preload.gir")
273 for name, func in preloads.items():273 for name, func in preloads.items():
274 info = funcs[name]274 info = funcs[name]
275 rpreloads.append([info, func])275 rpreloads.append([info, func])
276276
=== 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 @@
1717
18import ctypes18import ctypes
1919
20from click.tests.config import (20from click_package.tests.config import (
21 STAT_OFFSET_GID,21 STAT_OFFSET_GID,
22 STAT_OFFSET_UID,22 STAT_OFFSET_UID,
23 STAT64_OFFSET_GID,23 STAT64_OFFSET_GID,
2424
=== 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 @@
4444
45from gi.repository import Click, GLib45from gi.repository import Click, GLib
4646
47from click.tests import gimock47from click_package.tests import gimock
4848
4949
50def disable_logging(func):50def disable_logging(func):
@@ -154,7 +154,7 @@
154 def _create_mock_framework_dir(self, frameworks_dir=None):154 def _create_mock_framework_dir(self, frameworks_dir=None):
155 if frameworks_dir is None:155 if frameworks_dir is None:
156 frameworks_dir = os.path.join(self.temp_dir, "frameworks")156 frameworks_dir = os.path.join(self.temp_dir, "frameworks")
157 patcher = mock.patch('click.paths.frameworks_dir', frameworks_dir)157 patcher = mock.patch('click_package.paths.frameworks_dir', frameworks_dir)
158 patcher.start()158 patcher.start()
159 self.addCleanup(patcher.stop)159 self.addCleanup(patcher.stop)
160 Click.ensuredir(frameworks_dir)160 Click.ensuredir(frameworks_dir)
161161
=== 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 @@
2424
25import apt25import apt
2626
27from click import osextras27from click_package import osextras
28from .helpers import (28from .helpers import (
29 require_root,29 require_root,
30 ClickTestCase,30 ClickTestCase,
3131
=== 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 @@
50 path_to_click],50 path_to_click],
51 universal_newlines=True, stderr=subprocess.STDOUT)51 universal_newlines=True, stderr=subprocess.STDOUT)
52 expected_error = (52 expected_error = (
53 'click.framework.ClickFrameworkInvalid: Framework '53 'click_package.framework.ClickFrameworkInvalid: Framework '
54 '"missing" not present on system (use '54 '"missing" not present on system (use '
55 '--force-missing-framework option to override)')55 '--force-missing-framework option to override)')
56 self.assertIn(expected_error, cm.exception.output)56 self.assertIn(expected_error, cm.exception.output)
@@ -66,7 +66,8 @@
66 path_to_click],66 path_to_click],
67 universal_newlines=True, stderr=subprocess.STDOUT)67 universal_newlines=True, stderr=subprocess.STDOUT)
68 expected_error = (68 expected_error = (
69 'click.install.DebsigVerifyError: Signature verification error: '69 'click_package.install.DebsigVerifyError: '
70 'Signature verification error: '
70 'debsig: %s does not appear to be a deb format package'71 'debsig: %s does not appear to be a deb format package'
71 ) % path_to_click72 ) % path_to_click
72 self.assertIn(expected_error, cm.exception.output)73 self.assertIn(expected_error, cm.exception.output)
7374
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.arfile."""16"""Unit tests for click_package.arfile."""
1717
18from __future__ import print_function18from __future__ import print_function
1919
@@ -26,8 +26,8 @@
26import os26import os
27import subprocess27import subprocess
2828
29from click.arfile import ArFile29from click_package.arfile import ArFile
30from click.tests.helpers import TestCase, touch30from click_package.tests.helpers import TestCase, touch
3131
3232
33class TestArFile(TestCase):33class TestArFile(TestCase):
3434
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.build."""16"""Unit tests for click_package.build."""
1717
18from __future__ import print_function18from __future__ import print_function
1919
@@ -31,9 +31,9 @@
31import tarfile31import tarfile
32from textwrap import dedent32from textwrap import dedent
3333
34from click.build import ClickBuildError, ClickBuilder, ClickSourceBuilder34from click_package.build import ClickBuildError, ClickBuilder, ClickSourceBuilder
35from click.preinst import static_preinst35from click_package.preinst import static_preinst
36from click.tests.helpers import (36from click_package.tests.helpers import (
37 disable_logging,37 disable_logging,
38 mkfile,38 mkfile,
39 TestCase,39 TestCase,
4040
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.chroot."""16"""Unit tests for click_package.chroot."""
1717
18from __future__ import print_function18from __future__ import print_function
1919
@@ -26,12 +26,12 @@
26import re26import re
27from textwrap import dedent27from textwrap import dedent
2828
29from click.chroot import (29from click_package.chroot import (
30 ClickChroot,30 ClickChroot,
31 generate_sources,31 generate_sources,
32 strip_dev_series_from_framework,32 strip_dev_series_from_framework,
33)33)
34from click.tests.helpers import TestCase, mock34from click_package.tests.helpers import TestCase, mock
3535
3636
37class FakeClickChroot(ClickChroot):37class FakeClickChroot(ClickChroot):
3838
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.database."""16"""Unit tests for click_package.database."""
1717
18from __future__ import print_function18from __future__ import print_function
1919
@@ -34,9 +34,9 @@
34from gi.repository import Click, GLib34from gi.repository import Click, GLib
35from six import integer_types35from six import integer_types
3636
37from click.json_helpers import json_array_to_python, json_object_to_python37from click_package.json_helpers import json_array_to_python, json_object_to_python
38from click.tests.gimock_types import Passwd38from click_package.tests.gimock_types import Passwd
39from click.tests.helpers import TestCase, mkfile, touch39from click_package.tests.helpers import TestCase, mkfile, touch
4040
4141
42class TestClickInstalledPackage(TestCase):42class TestClickInstalledPackage(TestCase):
4343
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.framework."""16"""Unit tests for click_package.framework."""
1717
18from __future__ import print_function18from __future__ import print_function
1919
@@ -27,7 +27,7 @@
2727
28from gi.repository import Click28from gi.repository import Click
2929
30from click.tests.helpers import TestCase, touch30from click_package.tests.helpers import TestCase, touch
3131
3232
33class TestClickFramework(TestCase):33class TestClickFramework(TestCase):
3434
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.hooks."""16"""Unit tests for click_package.hooks."""
1717
18from __future__ import print_function18from __future__ import print_function
1919
@@ -35,8 +35,8 @@
3535
36from gi.repository import Click, GLib36from gi.repository import Click, GLib
3737
38from click.tests.gimock_types import Passwd38from click_package.tests.gimock_types import Passwd
39from click.tests.helpers import TestCase, mkfile, mkfile_utf839from click_package.tests.helpers import TestCase, mkfile, mkfile_utf8
4040
4141
42class TestClickPatternFormatter(TestCase):42class TestClickPatternFormatter(TestCase):
4343
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.install."""16"""Unit tests for click_package.install."""
1717
18from __future__ import print_function18from __future__ import print_function
1919
@@ -40,22 +40,22 @@
40from debian.deb822 import Deb82240from debian.deb822 import Deb822
41from gi.repository import Click41from gi.repository import Click
4242
43from click.arfile import ArFile43from click_package.arfile import ArFile
44from click.build import ClickBuilder44from click_package.build import ClickBuilder
45from click.install import (45from click_package.install import (
46 ClickInstaller,46 ClickInstaller,
47 ClickInstallerAuditError,47 ClickInstallerAuditError,
48 ClickInstallerPermissionDenied,48 ClickInstallerPermissionDenied,
49)49)
50from click.preinst import static_preinst50from click_package.preinst import static_preinst
51from click.tests.helpers import (51from click_package.tests.helpers import (
52 disable_logging,52 disable_logging,
53 mkfile,53 mkfile,
54 mock,54 mock,
55 TestCase,55 TestCase,
56 touch,56 touch,
57)57)
58from click.versions import spec_version58from click_package.versions import spec_version
5959
6060
61@contextmanager61@contextmanager
@@ -82,7 +82,7 @@
82 self.db = Click.DB()82 self.db = Click.DB()
83 self.db.add(self.temp_dir)83 self.db.add(self.temp_dir)
84 # mock signature checks during the tests84 # mock signature checks during the tests
85 self.debsig_patcher = mock.patch("click.install.DebsigVerify")85 self.debsig_patcher = mock.patch("click_package.install.DebsigVerify")
86 self.debsig_patcher.start()86 self.debsig_patcher.start()
8787
88 def tearDown(self):88 def tearDown(self):
@@ -652,7 +652,7 @@
652 os.path.exists(ClickInstaller(None)._preload_path()),652 os.path.exists(ClickInstaller(None)._preload_path()),
653 "preload bits not built; installing packages will fail")653 "preload bits not built; installing packages will fail")
654 @mock.patch("gi.repository.Click.package_install_hooks")654 @mock.patch("gi.repository.Click.package_install_hooks")
655 @mock.patch("click.install.ClickInstaller._dpkg_architecture")655 @mock.patch("click_package.install.ClickInstaller._dpkg_architecture")
656 def test_single_architecture(self, mock_dpkg_architecture,656 def test_single_architecture(self, mock_dpkg_architecture,
657 mock_package_install_hooks):657 mock_package_install_hooks):
658 with self.run_in_subprocess(658 with self.run_in_subprocess(
@@ -689,7 +689,7 @@
689 os.path.exists(ClickInstaller(None)._preload_path()),689 os.path.exists(ClickInstaller(None)._preload_path()),
690 "preload bits not built; installing packages will fail")690 "preload bits not built; installing packages will fail")
691 @mock.patch("gi.repository.Click.package_install_hooks")691 @mock.patch("gi.repository.Click.package_install_hooks")
692 @mock.patch("click.install.ClickInstaller._dpkg_architecture")692 @mock.patch("click_package.install.ClickInstaller._dpkg_architecture")
693 def test_multiple_architectures(self, mock_dpkg_architecture,693 def test_multiple_architectures(self, mock_dpkg_architecture,
694 mock_package_install_hooks):694 mock_package_install_hooks):
695 with self.run_in_subprocess(695 with self.run_in_subprocess(
696696
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.osextras."""16"""Unit tests for click_package.osextras."""
1717
18from __future__ import print_function18from __future__ import print_function
19__all__ = [19__all__ = [
@@ -26,8 +26,8 @@
2626
27from gi.repository import Click, GLib27from gi.repository import Click, GLib
2828
29from click import osextras29from click_package import osextras
30from click.tests.helpers import TestCase, mock, touch30from click_package.tests.helpers import TestCase, mock, touch
3131
3232
33class TestOSExtrasBaseMixin:33class TestOSExtrasBaseMixin:
3434
=== 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 @@
2828
29from gi.repository import Click29from gi.repository import Click
3030
31from click.tests.helpers import TestCase31from click_package.tests.helpers import TestCase
3232
3333
34class TestClickPaths(TestCase):34class TestClickPaths(TestCase):
3535
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.query."""16"""Unit tests for click_package.query."""
1717
18from __future__ import print_function18from __future__ import print_function
19__all__ = [19__all__ = [
@@ -25,7 +25,7 @@
2525
26from gi.repository import Click26from gi.repository import Click
2727
28from click.tests.helpers import TestCase, touch28from click_package.tests.helpers import TestCase, touch
2929
3030
31class TestQuery(TestCase):31class TestQuery(TestCase):
3232
=== 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 @@
24import subprocess24import subprocess
25from unittest import skipIf25from unittest import skipIf
2626
27from click.tests.helpers import TestCase27from click_package.tests.helpers import TestCase
2828
2929
30class TestScripts(TestCase):30class TestScripts(TestCase):
3131
=== 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 @@
41 pyflakes = None41 pyflakes = None
4242
4343
44from click.tests.helpers import TestCase44from click_package.tests.helpers import TestCase
4545
4646
47class TestStatic(TestCase):47class TestStatic(TestCase):
48 def all_paths(self):48 def all_paths(self):
49 paths = []49 paths = []
50 start_dir = os.path.dirname(resource_filename('click', '__init__.py'))50 start_dir = os.path.dirname(resource_filename('click_package', '__init__.py'))
51 for dirpath, dirnames, filenames in os.walk(start_dir):51 for dirpath, dirnames, filenames in os.walk(start_dir):
52 for ignore in ('doc', ".bzr", "__pycache__"):52 for ignore in ('doc', ".bzr", "__pycache__"):
53 if ignore in dirnames:53 if ignore in dirnames:
5454
=== 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 @@
13# You should have received a copy of the GNU General Public License13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.14# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
16"""Unit tests for click.user."""16"""Unit tests for click_package.user."""
1717
18from __future__ import print_function18from __future__ import print_function
1919
@@ -30,9 +30,9 @@
3030
31from gi.repository import Click, GLib31from gi.repository import Click, GLib
3232
33from click.json_helpers import json_array_to_python, json_object_to_python33from click_package.json_helpers import json_array_to_python, json_object_to_python
34from click.tests.gimock_types import Passwd34from click_package.tests.gimock_types import Passwd
35from click.tests.helpers import (35from click_package.tests.helpers import (
36 TestCase,36 TestCase,
37 make_installed_click,37 make_installed_click,
38 mkfile,38 mkfile,
3939
=== 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 @@
131131
132AC_CONFIG_FILES([132AC_CONFIG_FILES([
133 Makefile133 Makefile
134 click/Makefile134 click_package/Makefile
135 click/tests/Makefile135 click_package/tests/Makefile
136 click/tests/config.py136 click_package/tests/config.py
137 conf/Makefile137 conf/Makefile
138 conf/databases/Makefile138 conf/databases/Makefile
139 conf/databases/99_default.conf139 conf/databases/99_default.conf
140140
=== 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 @@
1click (0.4.46-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Rename the python package this installs from click to click_package.
4 (LP: #1693226)
5
6 -- Sergio Schvezov <sergio.schvezov@canonical.com> Fri, 26 May 2017 13:03:44 -0300
7
1click (0.4.45.1+16.10.20160916-0ubuntu1) yakkety; urgency=medium8click (0.4.45.1+16.10.20160916-0ubuntu1) yakkety; urgency=medium
29
3 * Kill gpg-agent (if possible) after running debsigs in integration tests.10 * Kill gpg-agent (if possible) after running debsigs in integration tests.
411
=== 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 @@
40Section: python40Section: python
41Architecture: any41Architecture: any
42Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-click-0.4 (= ${binary:Version}), gir1.2-glib-2.0, python3-apt, python3-debian, python3-gi42Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-click-0.4 (= ${binary:Version}), gir1.2-glib-2.0, python3-apt, python3-debian, python3-gi
43Conflicts: python3-click, python3-click-cli
44Replaces: python3-click (<< 0.4.43)43Replaces: python3-click (<< 0.4.43)
45Description: Click packages (Python 3 interface)44Description: Click packages (Python 3 interface)
46 Click is a simplified packaging format that installs in a separate part of45 Click is a simplified packaging format that installs in a separate part of
4746
=== 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 @@
10 --with-systemduserunitdir=/usr/lib/systemd/user \10 --with-systemduserunitdir=/usr/lib/systemd/user \
11 --disable-packagekit11 --disable-packagekit
1212
13TEST_INTEGRATION=1 python3 -m unittest discover -vv click.tests.integration13TEST_INTEGRATION=1 python3 -m unittest discover -vv click_package.tests.integration
1414
=== 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 @@
8484
85To run a specific testcase, use the standard python unittest syntax like::85To run a specific testcase, use the standard python unittest syntax like::
8686
87 $ python3 -m unittest click.tests.test_install87 $ python3 -m unittest click_package.tests.test_install
8888
89or::89or::
9090
91 $ python2 -m unittest click.tests.test_build.TestClickBuilder.test_build91 $ python2 -m unittest click_package.tests.test_build.TestClickBuilder.test_build
9292
93Test coverage93Test coverage
94-------------94-------------
@@ -130,7 +130,7 @@
130 GI_TYPELIB_PATH=$(pwd)/lib/click \130 GI_TYPELIB_PATH=$(pwd)/lib/click \
131 CLICK_BINARY=$(pwd)/bin/click \131 CLICK_BINARY=$(pwd)/bin/click \
132 TEST_INTEGRATION=1 \132 TEST_INTEGRATION=1 \
133 python3 -m unittest discover click.tests.integration133 python3 -m unittest discover click_package.tests.integration
134134
135to run against the build tree.135to run against the build tree.
136136
137137
=== 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 @@
29 coverage_executable = "python3-coverage"29 coverage_executable = "python3-coverage"
30 self.spawn([30 self.spawn([
31 coverage_executable, "run", "-m", "unittest",31 coverage_executable, "run", "-m", "unittest",
32 "discover", "-vv", "click.tests"])32 "discover", "-vv", "click_package.tests"])
33 self.spawn([coverage_executable, "combine"])33 self.spawn([coverage_executable, "combine"])
34 self.spawn([34 self.spawn([
35 coverage_executable, "xml", "-o", "coverage-python.xml"])35 coverage_executable, "xml", "-o", "coverage-python.xml"])
@@ -49,5 +49,5 @@
49 scripts=['bin/click'],49 scripts=['bin/click'],
50 install_requires=requirements,50 install_requires=requirements,
51 cmdclass={"test": test_extra},51 cmdclass={"test": test_extra},
52 test_suite="click.tests",52 test_suite="click_package.tests",
53 )53 )
5454
=== 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 @@
1[tox]1[tox]
2envlist = py27,py32,py33,py342envlist = py27,py32,py33,py34,py35,py36
33
4[testenv]4[testenv]
5commands = python -m unittest discover -vv click.tests5commands = python -m unittest discover -vv click_package.tests
6sitepackages = True6sitepackages = True

Subscribers

People subscribed via source and target branches

to all changes: