Merge lp:~kyrofa/click/xenial-package-rename into lp:~click-hackers/click/xenial
- xenial-package-rename
- Merge into xenial
Proposed by
Kyle Fazzari
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Kyle Fazzari | ||||
Approved revision: | 608 | ||||
Merged at revision: | 607 | ||||
Proposed branch: | lp:~kyrofa/click/xenial-package-rename | ||||
Merge into: | lp:~click-hackers/click/xenial | ||||
Diff against target: |
786 lines (+99/-92) 40 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_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:~kyrofa/click/xenial-package-rename | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson | Approve | ||
Review via email: mp+325578@code.launchpad.net |
Commit message
Description of the change
Rename the python package this installs from click to click_package.
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2015-12-15 12:04:40 +0000 |
3 | +++ .bzrignore 2017-06-13 17:12:22 +0000 |
4 | @@ -30,10 +30,10 @@ |
5 | *.egg-info |
6 | dist |
7 | .tox |
8 | -click/paths.py |
9 | -click/tests/config.py |
10 | -click/tests/preload.gir |
11 | -click/tests/test_paths.py |
12 | +click_package/paths.py |
13 | +click_package/tests/config.py |
14 | +click_package/tests/preload.gir |
15 | +click_package/tests/test_paths.py |
16 | build-aux/compile |
17 | build-aux/config.guess |
18 | build-aux/config.rpath |
19 | |
20 | === modified file 'Makefile.am' |
21 | --- Makefile.am 2014-06-30 16:48:31 +0000 |
22 | +++ Makefile.am 2017-06-13 17:12:22 +0000 |
23 | @@ -1,4 +1,4 @@ |
24 | -SUBDIRS = lib preload click conf debhelper init po schroot |
25 | +SUBDIRS = lib preload click_package conf debhelper init po schroot |
26 | if PACKAGEKIT |
27 | SUBDIRS += pk-plugin |
28 | endif |
29 | |
30 | === modified file 'bin/click' |
31 | --- bin/click 2015-12-03 22:40:33 +0000 |
32 | +++ bin/click 2017-06-13 17:12:22 +0000 |
33 | @@ -34,7 +34,7 @@ |
34 | # There is an unfortunate name clash with |
35 | # https://pypi.python.org/pypi/click; try to detect this and take evasive |
36 | # action. |
37 | -import click |
38 | +import click_package as click |
39 | if not getattr(click, "_CLICK_IS_A_PACKAGING_FORMAT_", None): |
40 | import site |
41 | wrong_click_mods = [ |
42 | @@ -52,7 +52,7 @@ |
43 | sys.exit(1) |
44 | del sys.path[user_site_index] |
45 | |
46 | -from click import commands |
47 | +from click_package import commands |
48 | |
49 | |
50 | def fix_stdout(): |
51 | |
52 | === renamed directory 'click' => 'click_package' |
53 | === modified file 'click_package/build.py' |
54 | --- click/build.py 2015-02-23 07:22:31 +0000 |
55 | +++ click_package/build.py 2017-06-13 17:12:22 +0000 |
56 | @@ -45,12 +45,12 @@ |
57 | # "click build" is required to work with only the Python standard library. |
58 | pass |
59 | |
60 | -from click import osextras |
61 | -from click.arfile import ArFile |
62 | -from click.preinst import static_preinst |
63 | -from click.versions import spec_version |
64 | +from click_package import osextras |
65 | +from click_package.arfile import ArFile |
66 | +from click_package.preinst import static_preinst |
67 | +from click_package.versions import spec_version |
68 | |
69 | -from click.framework import ( |
70 | +from click_package.framework import ( |
71 | validate_framework, |
72 | ClickFrameworkInvalid, |
73 | ) |
74 | |
75 | === modified file 'click_package/commands/__init__.py' |
76 | --- click/commands/__init__.py 2014-05-20 09:03:05 +0000 |
77 | +++ click_package/commands/__init__.py 2017-06-13 17:12:22 +0000 |
78 | @@ -42,7 +42,7 @@ |
79 | |
80 | |
81 | def load_command(command): |
82 | - return importlib.import_module("click.commands.%s" % command) |
83 | + return importlib.import_module("click_package.commands.%s" % command) |
84 | |
85 | |
86 | def help_text(): |
87 | |
88 | === modified file 'click_package/commands/build.py' |
89 | --- click/commands/build.py 2015-02-24 12:19:11 +0000 |
90 | +++ click_package/commands/build.py 2017-06-13 17:12:22 +0000 |
91 | @@ -23,7 +23,7 @@ |
92 | import subprocess |
93 | |
94 | from gi.repository import Click |
95 | -from click.build import ClickBuildError, ClickBuilder |
96 | +from click_package.build import ClickBuildError, ClickBuilder |
97 | |
98 | |
99 | def run(argv): |
100 | |
101 | === modified file 'click_package/commands/buildsource.py' |
102 | --- click/commands/buildsource.py 2015-02-26 17:01:45 +0000 |
103 | +++ click_package/commands/buildsource.py 2017-06-13 17:12:22 +0000 |
104 | @@ -21,7 +21,7 @@ |
105 | import os |
106 | import sys |
107 | |
108 | -from click.build import ClickBuildError, ClickSourceBuilder |
109 | +from click_package.build import ClickBuildError, ClickSourceBuilder |
110 | |
111 | |
112 | def run(argv): |
113 | |
114 | === modified file 'click_package/commands/chroot.py' |
115 | --- click/commands/chroot.py 2015-05-01 07:28:16 +0000 |
116 | +++ click_package/commands/chroot.py 2017-06-13 17:12:22 +0000 |
117 | @@ -23,12 +23,12 @@ |
118 | from contextlib import contextmanager |
119 | import os |
120 | |
121 | -from click.chroot import ( |
122 | +from click_package.chroot import ( |
123 | ClickChroot, |
124 | ClickChrootAlreadyExistsException, |
125 | ClickChrootDoesNotExistException, |
126 | ) |
127 | -from click import osextras |
128 | +from click_package import osextras |
129 | |
130 | |
131 | def requires_root(parser): |
132 | |
133 | === modified file 'click_package/commands/desktophook.py' |
134 | --- click/commands/desktophook.py 2014-03-03 17:01:37 +0000 |
135 | +++ click_package/commands/desktophook.py 2017-06-13 17:12:22 +0000 |
136 | @@ -25,7 +25,7 @@ |
137 | |
138 | from gi.repository import Click |
139 | |
140 | -from click import osextras |
141 | +from click_package import osextras |
142 | |
143 | |
144 | COMMENT = \ |
145 | |
146 | === modified file 'click_package/commands/info.py' |
147 | --- click/commands/info.py 2014-10-07 08:56:03 +0000 |
148 | +++ click_package/commands/info.py 2017-06-13 17:12:22 +0000 |
149 | @@ -26,8 +26,8 @@ |
150 | |
151 | from gi.repository import Click |
152 | |
153 | -from click.install import DebFile |
154 | -from click.json_helpers import json_object_to_python |
155 | +from click_package.install import DebFile |
156 | +from click_package.json_helpers import json_object_to_python |
157 | |
158 | |
159 | def _load_manifest(manifest_file): |
160 | |
161 | === modified file 'click_package/commands/install.py' |
162 | --- click/commands/install.py 2014-12-03 12:42:21 +0000 |
163 | +++ click_package/commands/install.py 2017-06-13 17:12:22 +0000 |
164 | @@ -23,7 +23,7 @@ |
165 | |
166 | from gi.repository import Click |
167 | |
168 | -from click.install import ClickInstaller, ClickInstallerError |
169 | +from click_package.install import ClickInstaller, ClickInstallerError |
170 | |
171 | |
172 | def run(argv): |
173 | |
174 | === modified file 'click_package/commands/list.py' |
175 | --- click/commands/list.py 2014-04-03 08:52:02 +0000 |
176 | +++ click_package/commands/list.py 2017-06-13 17:12:22 +0000 |
177 | @@ -23,7 +23,7 @@ |
178 | |
179 | from gi.repository import Click |
180 | |
181 | -from click.json_helpers import json_array_to_python |
182 | +from click_package.json_helpers import json_array_to_python |
183 | |
184 | |
185 | def list_packages(options): |
186 | |
187 | === modified file 'click_package/commands/verify.py' |
188 | --- click/commands/verify.py 2014-08-07 21:51:27 +0000 |
189 | +++ click_package/commands/verify.py 2017-06-13 17:12:22 +0000 |
190 | @@ -21,7 +21,7 @@ |
191 | |
192 | from optparse import OptionParser |
193 | |
194 | -from click.install import ClickInstaller |
195 | +from click_package.install import ClickInstaller |
196 | |
197 | |
198 | def run(argv): |
199 | |
200 | === modified file 'click_package/framework.py' |
201 | --- click/framework.py 2015-02-18 09:17:29 +0000 |
202 | +++ click_package/framework.py 2017-06-13 17:12:22 +0000 |
203 | @@ -24,7 +24,7 @@ |
204 | except: |
205 | pass |
206 | |
207 | -import click.paths |
208 | +import click_package.paths |
209 | |
210 | |
211 | class ClickFrameworkInvalid(Exception): |
212 | @@ -55,7 +55,7 @@ |
213 | |
214 | # python version of vala get_frameworks_dir |
215 | def get_frameworks_dir(): |
216 | - return click.paths.frameworks_dir |
217 | + return click_package.paths.frameworks_dir |
218 | |
219 | |
220 | def get_framework_path(framework_name): |
221 | |
222 | === modified file 'click_package/install.py' |
223 | --- click/install.py 2015-12-11 01:15:20 +0000 |
224 | +++ click_package/install.py 2017-06-13 17:12:22 +0000 |
225 | @@ -46,11 +46,11 @@ |
226 | from debian.debian_support import Version |
227 | from gi.repository import Click |
228 | |
229 | -from click.paths import preload_path |
230 | -from click.preinst import static_preinst_matches |
231 | -from click.versions import spec_version |
232 | +from click_package.paths import preload_path |
233 | +from click_package.preinst import static_preinst_matches |
234 | +from click_package.versions import spec_version |
235 | |
236 | -from click.framework import ( |
237 | +from click_package.framework import ( |
238 | validate_framework, |
239 | ClickFrameworkInvalid, |
240 | ) |
241 | |
242 | === modified file 'click_package/tests/__init__.py' |
243 | --- click/tests/__init__.py 2014-06-09 14:21:26 +0000 |
244 | +++ click_package/tests/__init__.py 2017-06-13 17:12:22 +0000 |
245 | @@ -3,7 +3,7 @@ |
246 | import os |
247 | import sys |
248 | |
249 | -from click.tests import config |
250 | +from click_package.tests import config |
251 | |
252 | |
253 | def _append_env_path(envname, value): |
254 | |
255 | === modified file 'click_package/tests/gimock.py' |
256 | --- click/tests/gimock.py 2014-06-23 21:14:06 +0000 |
257 | +++ click_package/tests/gimock.py 2017-06-13 17:12:22 +0000 |
258 | @@ -128,8 +128,8 @@ |
259 | except ImportError: |
260 | import xml.etree.ElementTree as etree |
261 | |
262 | -from click.tests.gimock_types import Stat, Stat64 |
263 | -from click.tests import get_executable |
264 | +from click_package.tests.gimock_types import Stat, Stat64 |
265 | +from click_package.tests import get_executable |
266 | |
267 | # Borrowed from giscanner.girparser. |
268 | CORE_NS = "http://www.gtk.org/introspection/core/1.0" |
269 | @@ -271,7 +271,7 @@ |
270 | "unistd.h", |
271 | ]) |
272 | preload_headers = set() |
273 | - funcs = self._parse_gir("click/tests/preload.gir") |
274 | + funcs = self._parse_gir("click_package/tests/preload.gir") |
275 | for name, func in preloads.items(): |
276 | info = funcs[name] |
277 | rpreloads.append([info, func]) |
278 | |
279 | === modified file 'click_package/tests/gimock_types.py' |
280 | --- click/tests/gimock_types.py 2014-03-03 17:01:37 +0000 |
281 | +++ click_package/tests/gimock_types.py 2017-06-13 17:12:22 +0000 |
282 | @@ -17,7 +17,7 @@ |
283 | |
284 | import ctypes |
285 | |
286 | -from click.tests.config import ( |
287 | +from click_package.tests.config import ( |
288 | STAT_OFFSET_GID, |
289 | STAT_OFFSET_UID, |
290 | STAT64_OFFSET_GID, |
291 | |
292 | === modified file 'click_package/tests/helpers.py' |
293 | --- click/tests/helpers.py 2014-10-02 06:57:37 +0000 |
294 | +++ click_package/tests/helpers.py 2017-06-13 17:12:22 +0000 |
295 | @@ -44,7 +44,7 @@ |
296 | |
297 | from gi.repository import Click, GLib |
298 | |
299 | -from click.tests import gimock |
300 | +from click_package.tests import gimock |
301 | |
302 | |
303 | def disable_logging(func): |
304 | @@ -154,7 +154,7 @@ |
305 | def _create_mock_framework_dir(self, frameworks_dir=None): |
306 | if frameworks_dir is None: |
307 | frameworks_dir = os.path.join(self.temp_dir, "frameworks") |
308 | - patcher = mock.patch('click.paths.frameworks_dir', frameworks_dir) |
309 | + patcher = mock.patch('click_package.paths.frameworks_dir', frameworks_dir) |
310 | patcher.start() |
311 | self.addCleanup(patcher.stop) |
312 | Click.ensuredir(frameworks_dir) |
313 | |
314 | === modified file 'click_package/tests/integration/test_verify.py' |
315 | --- click/tests/integration/test_verify.py 2014-09-04 14:15:08 +0000 |
316 | +++ click_package/tests/integration/test_verify.py 2017-06-13 17:12:22 +0000 |
317 | @@ -50,7 +50,7 @@ |
318 | path_to_click], |
319 | universal_newlines=True, stderr=subprocess.STDOUT) |
320 | expected_error = ( |
321 | - 'click.framework.ClickFrameworkInvalid: Framework ' |
322 | + 'click_package.framework.ClickFrameworkInvalid: Framework ' |
323 | '"missing" not present on system (use ' |
324 | '--force-missing-framework option to override)') |
325 | self.assertIn(expected_error, cm.exception.output) |
326 | @@ -66,7 +66,8 @@ |
327 | path_to_click], |
328 | universal_newlines=True, stderr=subprocess.STDOUT) |
329 | expected_error = ( |
330 | - 'click.install.DebsigVerifyError: Signature verification error: ' |
331 | + 'click_package.install.DebsigVerifyError: ' |
332 | + 'Signature verification error: ' |
333 | 'debsig: %s does not appear to be a deb format package' |
334 | ) % path_to_click |
335 | self.assertIn(expected_error, cm.exception.output) |
336 | |
337 | === modified file 'click_package/tests/test_arfile.py' |
338 | --- click/tests/test_arfile.py 2013-06-27 14:30:15 +0000 |
339 | +++ click_package/tests/test_arfile.py 2017-06-13 17:12:22 +0000 |
340 | @@ -13,7 +13,7 @@ |
341 | # You should have received a copy of the GNU General Public License |
342 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
343 | |
344 | -"""Unit tests for click.arfile.""" |
345 | +"""Unit tests for click_package.arfile.""" |
346 | |
347 | from __future__ import print_function |
348 | |
349 | @@ -26,8 +26,8 @@ |
350 | import os |
351 | import subprocess |
352 | |
353 | -from click.arfile import ArFile |
354 | -from click.tests.helpers import TestCase, touch |
355 | +from click_package.arfile import ArFile |
356 | +from click_package.tests.helpers import TestCase, touch |
357 | |
358 | |
359 | class TestArFile(TestCase): |
360 | |
361 | === modified file 'click_package/tests/test_build.py' |
362 | --- click/tests/test_build.py 2015-02-23 07:23:39 +0000 |
363 | +++ click_package/tests/test_build.py 2017-06-13 17:12:22 +0000 |
364 | @@ -13,7 +13,7 @@ |
365 | # You should have received a copy of the GNU General Public License |
366 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
367 | |
368 | -"""Unit tests for click.build.""" |
369 | +"""Unit tests for click_package.build.""" |
370 | |
371 | from __future__ import print_function |
372 | |
373 | @@ -31,9 +31,9 @@ |
374 | import tarfile |
375 | from textwrap import dedent |
376 | |
377 | -from click.build import ClickBuildError, ClickBuilder, ClickSourceBuilder |
378 | -from click.preinst import static_preinst |
379 | -from click.tests.helpers import ( |
380 | +from click_package.build import ClickBuildError, ClickBuilder, ClickSourceBuilder |
381 | +from click_package.preinst import static_preinst |
382 | +from click_package.tests.helpers import ( |
383 | disable_logging, |
384 | mkfile, |
385 | TestCase, |
386 | |
387 | === modified file 'click_package/tests/test_chroot.py' |
388 | --- click/tests/test_chroot.py 2015-12-29 01:12:58 +0000 |
389 | +++ click_package/tests/test_chroot.py 2017-06-13 17:12:22 +0000 |
390 | @@ -13,7 +13,7 @@ |
391 | # You should have received a copy of the GNU General Public License |
392 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
393 | |
394 | -"""Unit tests for click.chroot.""" |
395 | +"""Unit tests for click_package.chroot.""" |
396 | |
397 | from __future__ import print_function |
398 | |
399 | @@ -26,12 +26,12 @@ |
400 | import re |
401 | from textwrap import dedent |
402 | |
403 | -from click.chroot import ( |
404 | +from click_package.chroot import ( |
405 | ClickChroot, |
406 | generate_sources, |
407 | strip_dev_series_from_framework, |
408 | ) |
409 | -from click.tests.helpers import TestCase, mock |
410 | +from click_package.tests.helpers import TestCase, mock |
411 | |
412 | |
413 | class FakeClickChroot(ClickChroot): |
414 | |
415 | === modified file 'click_package/tests/test_database.py' |
416 | --- click/tests/test_database.py 2015-10-15 11:47:35 +0000 |
417 | +++ click_package/tests/test_database.py 2017-06-13 17:12:22 +0000 |
418 | @@ -13,7 +13,7 @@ |
419 | # You should have received a copy of the GNU General Public License |
420 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
421 | |
422 | -"""Unit tests for click.database.""" |
423 | +"""Unit tests for click_package.database.""" |
424 | |
425 | from __future__ import print_function |
426 | |
427 | @@ -34,9 +34,9 @@ |
428 | from gi.repository import Click, GLib |
429 | from six import integer_types |
430 | |
431 | -from click.json_helpers import json_array_to_python, json_object_to_python |
432 | -from click.tests.gimock_types import Passwd |
433 | -from click.tests.helpers import TestCase, mkfile, touch |
434 | +from click_package.json_helpers import json_array_to_python, json_object_to_python |
435 | +from click_package.tests.gimock_types import Passwd |
436 | +from click_package.tests.helpers import TestCase, mkfile, touch |
437 | |
438 | |
439 | class TestClickInstalledPackage(TestCase): |
440 | |
441 | === modified file 'click_package/tests/test_framework.py' |
442 | --- click/tests/test_framework.py 2014-07-09 12:56:21 +0000 |
443 | +++ click_package/tests/test_framework.py 2017-06-13 17:12:22 +0000 |
444 | @@ -13,7 +13,7 @@ |
445 | # You should have received a copy of the GNU General Public License |
446 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
447 | |
448 | -"""Unit tests for click.framework.""" |
449 | +"""Unit tests for click_package.framework.""" |
450 | |
451 | from __future__ import print_function |
452 | |
453 | @@ -27,7 +27,7 @@ |
454 | |
455 | from gi.repository import Click |
456 | |
457 | -from click.tests.helpers import TestCase, touch |
458 | +from click_package.tests.helpers import TestCase, touch |
459 | |
460 | |
461 | class TestClickFramework(TestCase): |
462 | |
463 | === modified file 'click_package/tests/test_hooks.py' |
464 | --- click/tests/test_hooks.py 2015-10-15 11:47:17 +0000 |
465 | +++ click_package/tests/test_hooks.py 2017-06-13 17:12:22 +0000 |
466 | @@ -13,7 +13,7 @@ |
467 | # You should have received a copy of the GNU General Public License |
468 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
469 | |
470 | -"""Unit tests for click.hooks.""" |
471 | +"""Unit tests for click_package.hooks.""" |
472 | |
473 | from __future__ import print_function |
474 | |
475 | @@ -35,8 +35,8 @@ |
476 | |
477 | from gi.repository import Click, GLib |
478 | |
479 | -from click.tests.gimock_types import Passwd |
480 | -from click.tests.helpers import TestCase, mkfile, mkfile_utf8 |
481 | +from click_package.tests.gimock_types import Passwd |
482 | +from click_package.tests.helpers import TestCase, mkfile, mkfile_utf8 |
483 | |
484 | |
485 | class TestClickPatternFormatter(TestCase): |
486 | |
487 | === modified file 'click_package/tests/test_install.py' |
488 | --- click/tests/test_install.py 2015-12-11 01:15:20 +0000 |
489 | +++ click_package/tests/test_install.py 2017-06-13 17:12:22 +0000 |
490 | @@ -13,7 +13,7 @@ |
491 | # You should have received a copy of the GNU General Public License |
492 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
493 | |
494 | -"""Unit tests for click.install.""" |
495 | +"""Unit tests for click_package.install.""" |
496 | |
497 | from __future__ import print_function |
498 | |
499 | @@ -40,22 +40,22 @@ |
500 | from debian.deb822 import Deb822 |
501 | from gi.repository import Click |
502 | |
503 | -from click.arfile import ArFile |
504 | -from click.build import ClickBuilder |
505 | -from click.install import ( |
506 | +from click_package.arfile import ArFile |
507 | +from click_package.build import ClickBuilder |
508 | +from click_package.install import ( |
509 | ClickInstaller, |
510 | ClickInstallerAuditError, |
511 | ClickInstallerPermissionDenied, |
512 | ) |
513 | -from click.preinst import static_preinst |
514 | -from click.tests.helpers import ( |
515 | +from click_package.preinst import static_preinst |
516 | +from click_package.tests.helpers import ( |
517 | disable_logging, |
518 | mkfile, |
519 | mock, |
520 | TestCase, |
521 | touch, |
522 | ) |
523 | -from click.versions import spec_version |
524 | +from click_package.versions import spec_version |
525 | |
526 | |
527 | @contextmanager |
528 | @@ -82,7 +82,7 @@ |
529 | self.db = Click.DB() |
530 | self.db.add(self.temp_dir) |
531 | # mock signature checks during the tests |
532 | - self.debsig_patcher = mock.patch("click.install.DebsigVerify") |
533 | + self.debsig_patcher = mock.patch("click_package.install.DebsigVerify") |
534 | self.debsig_patcher.start() |
535 | |
536 | def tearDown(self): |
537 | @@ -652,7 +652,7 @@ |
538 | os.path.exists(ClickInstaller(None)._preload_path()), |
539 | "preload bits not built; installing packages will fail") |
540 | @mock.patch("gi.repository.Click.package_install_hooks") |
541 | - @mock.patch("click.install.ClickInstaller._dpkg_architecture") |
542 | + @mock.patch("click_package.install.ClickInstaller._dpkg_architecture") |
543 | def test_single_architecture(self, mock_dpkg_architecture, |
544 | mock_package_install_hooks): |
545 | with self.run_in_subprocess( |
546 | @@ -689,7 +689,7 @@ |
547 | os.path.exists(ClickInstaller(None)._preload_path()), |
548 | "preload bits not built; installing packages will fail") |
549 | @mock.patch("gi.repository.Click.package_install_hooks") |
550 | - @mock.patch("click.install.ClickInstaller._dpkg_architecture") |
551 | + @mock.patch("click_package.install.ClickInstaller._dpkg_architecture") |
552 | def test_multiple_architectures(self, mock_dpkg_architecture, |
553 | mock_package_install_hooks): |
554 | with self.run_in_subprocess( |
555 | |
556 | === modified file 'click_package/tests/test_osextras.py' |
557 | --- click/tests/test_osextras.py 2014-07-09 12:56:21 +0000 |
558 | +++ click_package/tests/test_osextras.py 2017-06-13 17:12:22 +0000 |
559 | @@ -13,7 +13,7 @@ |
560 | # You should have received a copy of the GNU General Public License |
561 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
562 | |
563 | -"""Unit tests for click.osextras.""" |
564 | +"""Unit tests for click_package.osextras.""" |
565 | |
566 | from __future__ import print_function |
567 | __all__ = [ |
568 | @@ -26,8 +26,8 @@ |
569 | |
570 | from gi.repository import Click, GLib |
571 | |
572 | -from click import osextras |
573 | -from click.tests.helpers import TestCase, mock, touch |
574 | +from click_package import osextras |
575 | +from click_package.tests.helpers import TestCase, mock, touch |
576 | |
577 | |
578 | class TestOSExtrasBaseMixin: |
579 | |
580 | === modified file 'click_package/tests/test_paths.py.in' |
581 | --- click/tests/test_paths.py.in 2014-07-09 12:56:21 +0000 |
582 | +++ click_package/tests/test_paths.py.in 2017-06-13 17:12:22 +0000 |
583 | @@ -28,7 +28,7 @@ |
584 | |
585 | from gi.repository import Click |
586 | |
587 | -from click.tests.helpers import TestCase |
588 | +from click_package.tests.helpers import TestCase |
589 | |
590 | |
591 | class TestClickPaths(TestCase): |
592 | |
593 | === modified file 'click_package/tests/test_query.py' |
594 | --- click/tests/test_query.py 2014-03-03 21:43:10 +0000 |
595 | +++ click_package/tests/test_query.py 2017-06-13 17:12:22 +0000 |
596 | @@ -13,7 +13,7 @@ |
597 | # You should have received a copy of the GNU General Public License |
598 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
599 | |
600 | -"""Unit tests for click.query.""" |
601 | +"""Unit tests for click_package.query.""" |
602 | |
603 | from __future__ import print_function |
604 | __all__ = [ |
605 | @@ -25,7 +25,7 @@ |
606 | |
607 | from gi.repository import Click |
608 | |
609 | -from click.tests.helpers import TestCase, touch |
610 | +from click_package.tests.helpers import TestCase, touch |
611 | |
612 | |
613 | class TestQuery(TestCase): |
614 | |
615 | === modified file 'click_package/tests/test_scripts.py' |
616 | --- click/tests/test_scripts.py 2013-06-27 14:30:15 +0000 |
617 | +++ click_package/tests/test_scripts.py 2017-06-13 17:12:22 +0000 |
618 | @@ -24,7 +24,7 @@ |
619 | import subprocess |
620 | from unittest import skipIf |
621 | |
622 | -from click.tests.helpers import TestCase |
623 | +from click_package.tests.helpers import TestCase |
624 | |
625 | |
626 | class TestScripts(TestCase): |
627 | |
628 | === modified file 'click_package/tests/test_static.py' |
629 | --- click/tests/test_static.py 2013-06-27 14:30:15 +0000 |
630 | +++ click_package/tests/test_static.py 2017-06-13 17:12:22 +0000 |
631 | @@ -41,13 +41,13 @@ |
632 | pyflakes = None |
633 | |
634 | |
635 | -from click.tests.helpers import TestCase |
636 | +from click_package.tests.helpers import TestCase |
637 | |
638 | |
639 | class TestStatic(TestCase): |
640 | def all_paths(self): |
641 | paths = [] |
642 | - start_dir = os.path.dirname(resource_filename('click', '__init__.py')) |
643 | + start_dir = os.path.dirname(resource_filename('click_package', '__init__.py')) |
644 | for dirpath, dirnames, filenames in os.walk(start_dir): |
645 | for ignore in ('doc', ".bzr", "__pycache__"): |
646 | if ignore in dirnames: |
647 | |
648 | === modified file 'click_package/tests/test_user.py' |
649 | --- click/tests/test_user.py 2014-10-02 06:57:37 +0000 |
650 | +++ click_package/tests/test_user.py 2017-06-13 17:12:22 +0000 |
651 | @@ -13,7 +13,7 @@ |
652 | # You should have received a copy of the GNU General Public License |
653 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
654 | |
655 | -"""Unit tests for click.user.""" |
656 | +"""Unit tests for click_package.user.""" |
657 | |
658 | from __future__ import print_function |
659 | |
660 | @@ -30,9 +30,9 @@ |
661 | |
662 | from gi.repository import Click, GLib |
663 | |
664 | -from click.json_helpers import json_array_to_python, json_object_to_python |
665 | -from click.tests.gimock_types import Passwd |
666 | -from click.tests.helpers import ( |
667 | +from click_package.json_helpers import json_array_to_python, json_object_to_python |
668 | +from click_package.tests.gimock_types import Passwd |
669 | +from click_package.tests.helpers import ( |
670 | TestCase, |
671 | make_installed_click, |
672 | mkfile, |
673 | |
674 | === modified file 'configure.ac' |
675 | --- configure.ac 2014-06-30 16:48:31 +0000 |
676 | +++ configure.ac 2017-06-13 17:12:22 +0000 |
677 | @@ -131,9 +131,9 @@ |
678 | |
679 | AC_CONFIG_FILES([ |
680 | Makefile |
681 | - click/Makefile |
682 | - click/tests/Makefile |
683 | - click/tests/config.py |
684 | + click_package/Makefile |
685 | + click_package/tests/Makefile |
686 | + click_package/tests/config.py |
687 | conf/Makefile |
688 | conf/databases/Makefile |
689 | conf/databases/99_default.conf |
690 | |
691 | === modified file 'debian/changelog' |
692 | --- debian/changelog 2016-02-12 11:10:43 +0000 |
693 | +++ debian/changelog 2017-06-13 17:12:22 +0000 |
694 | @@ -1,3 +1,10 @@ |
695 | +click (0.4.43-0ubuntu1) UNRELEASED; urgency=medium |
696 | + |
697 | + * Rename the python package this installs from click to click_package. |
698 | + (LP: #1693226) |
699 | + |
700 | + -- Kyle Fazzari <kyle@canonical.com> Tue, 13 Jun 2017 09:45:32 -0700 |
701 | + |
702 | click (0.4.43+16.04.20160203-0ubuntu2) xenial; urgency=medium |
703 | |
704 | * Fix python3-click-package -> python3-click Replaces version |
705 | |
706 | === modified file 'debian/control' |
707 | --- debian/control 2016-02-12 11:10:43 +0000 |
708 | +++ debian/control 2017-06-13 17:12:22 +0000 |
709 | @@ -40,7 +40,6 @@ |
710 | Section: python |
711 | Architecture: any |
712 | Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-click-0.4 (= ${binary:Version}), gir1.2-glib-2.0, python3-apt, python3-debian, python3-gi |
713 | -Conflicts: python3-click, python3-click-cli |
714 | Replaces: python3-click (<< 0.4.43) |
715 | Description: Click packages (Python 3 interface) |
716 | Click is a simplified packaging format that installs in a separate part of |
717 | |
718 | === modified file 'debian/tests/run-tests.sh' |
719 | --- debian/tests/run-tests.sh 2014-09-09 07:56:17 +0000 |
720 | +++ debian/tests/run-tests.sh 2017-06-13 17:12:22 +0000 |
721 | @@ -9,4 +9,4 @@ |
722 | --with-systemdsystemunitdir=/lib/systemd/system \ |
723 | --with-systemduserunitdir=/usr/lib/systemd/user |
724 | |
725 | -TEST_INTEGRATION=1 python3 -m unittest discover -vv click.tests.integration |
726 | +TEST_INTEGRATION=1 python3 -m unittest discover -vv click_package.tests.integration |
727 | |
728 | === modified file 'doc/index.rst' |
729 | --- doc/index.rst 2015-05-01 07:28:16 +0000 |
730 | +++ doc/index.rst 2017-06-13 17:12:22 +0000 |
731 | @@ -84,11 +84,11 @@ |
732 | |
733 | To run a specific testcase, use the standard python unittest syntax like:: |
734 | |
735 | - $ python3 -m unittest click.tests.test_install |
736 | + $ python3 -m unittest click_package.tests.test_install |
737 | |
738 | or:: |
739 | |
740 | - $ python2 -m unittest click.tests.test_build.TestClickBuilder.test_build |
741 | + $ python2 -m unittest click_package.tests.test_build.TestClickBuilder.test_build |
742 | |
743 | Test coverage |
744 | ------------- |
745 | @@ -130,7 +130,7 @@ |
746 | GI_TYPELIB_PATH=$(pwd)/lib/click \ |
747 | CLICK_BINARY=$(pwd)/bin/click \ |
748 | TEST_INTEGRATION=1 \ |
749 | - python3 -m unittest discover click.tests.integration |
750 | + python3 -m unittest discover click_package.tests.integration |
751 | |
752 | to run against the build tree. |
753 | |
754 | |
755 | === modified file 'setup.py.in' |
756 | --- setup.py.in 2014-06-30 16:48:31 +0000 |
757 | +++ setup.py.in 2017-06-13 17:12:22 +0000 |
758 | @@ -29,7 +29,7 @@ |
759 | coverage_executable = "python3-coverage" |
760 | self.spawn([ |
761 | coverage_executable, "run", "-m", "unittest", |
762 | - "discover", "-vv", "click.tests"]) |
763 | + "discover", "-vv", "click_package.tests"]) |
764 | self.spawn([coverage_executable, "combine"]) |
765 | self.spawn([ |
766 | coverage_executable, "xml", "-o", "coverage-python.xml"]) |
767 | @@ -49,5 +49,5 @@ |
768 | scripts=['bin/click'], |
769 | install_requires=requirements, |
770 | cmdclass={"test": test_extra}, |
771 | - test_suite="click.tests", |
772 | + test_suite="click_package.tests", |
773 | ) |
774 | |
775 | === modified file 'tox.ini' |
776 | --- tox.ini 2014-03-03 12:44:14 +0000 |
777 | +++ tox.ini 2017-06-13 17:12:22 +0000 |
778 | @@ -1,6 +1,6 @@ |
779 | [tox] |
780 | -envlist = py27,py32,py33,py34 |
781 | +envlist = py27,py32,py33,py34,py35,py36 |
782 | |
783 | [testenv] |
784 | -commands = python -m unittest discover -vv click.tests |
785 | +commands = python -m unittest discover -vv click_package.tests |
786 | sitepackages = True |