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
1=== modified file '.bzrignore'
2--- .bzrignore 2015-12-15 12:04:40 +0000
3+++ .bzrignore 2017-06-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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-07 11:34:17 +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 2016-08-28 00:39:05 +0000
257+++ click_package/tests/gimock.py 2017-06-07 11:34:17 +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 config, get_executable
264+from click_package.tests.gimock_types import Stat, Stat64
265+from click_package.tests import config, get_executable
266
267 # Borrowed from giscanner.girparser.
268 CORE_NS = "http://www.gtk.org/introspection/core/1.0"
269@@ -269,7 +269,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-07 11:34:17 +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-07 11:34:17 +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_signatures.py'
315--- click/tests/integration/test_signatures.py 2016-09-16 17:41:30 +0000
316+++ click_package/tests/integration/test_signatures.py 2017-06-07 11:34:17 +0000
317@@ -24,7 +24,7 @@
318
319 import apt
320
321-from click import osextras
322+from click_package import osextras
323 from .helpers import (
324 require_root,
325 ClickTestCase,
326
327=== modified file 'click_package/tests/integration/test_verify.py'
328--- click/tests/integration/test_verify.py 2014-09-04 14:15:08 +0000
329+++ click_package/tests/integration/test_verify.py 2017-06-07 11:34:17 +0000
330@@ -50,7 +50,7 @@
331 path_to_click],
332 universal_newlines=True, stderr=subprocess.STDOUT)
333 expected_error = (
334- 'click.framework.ClickFrameworkInvalid: Framework '
335+ 'click_package.framework.ClickFrameworkInvalid: Framework '
336 '"missing" not present on system (use '
337 '--force-missing-framework option to override)')
338 self.assertIn(expected_error, cm.exception.output)
339@@ -66,7 +66,8 @@
340 path_to_click],
341 universal_newlines=True, stderr=subprocess.STDOUT)
342 expected_error = (
343- 'click.install.DebsigVerifyError: Signature verification error: '
344+ 'click_package.install.DebsigVerifyError: '
345+ 'Signature verification error: '
346 'debsig: %s does not appear to be a deb format package'
347 ) % path_to_click
348 self.assertIn(expected_error, cm.exception.output)
349
350=== modified file 'click_package/tests/test_arfile.py'
351--- click/tests/test_arfile.py 2013-06-27 14:30:15 +0000
352+++ click_package/tests/test_arfile.py 2017-06-07 11:34:17 +0000
353@@ -13,7 +13,7 @@
354 # You should have received a copy of the GNU General Public License
355 # along with this program. If not, see <http://www.gnu.org/licenses/>.
356
357-"""Unit tests for click.arfile."""
358+"""Unit tests for click_package.arfile."""
359
360 from __future__ import print_function
361
362@@ -26,8 +26,8 @@
363 import os
364 import subprocess
365
366-from click.arfile import ArFile
367-from click.tests.helpers import TestCase, touch
368+from click_package.arfile import ArFile
369+from click_package.tests.helpers import TestCase, touch
370
371
372 class TestArFile(TestCase):
373
374=== modified file 'click_package/tests/test_build.py'
375--- click/tests/test_build.py 2015-02-23 07:23:39 +0000
376+++ click_package/tests/test_build.py 2017-06-07 11:34:17 +0000
377@@ -13,7 +13,7 @@
378 # You should have received a copy of the GNU General Public License
379 # along with this program. If not, see <http://www.gnu.org/licenses/>.
380
381-"""Unit tests for click.build."""
382+"""Unit tests for click_package.build."""
383
384 from __future__ import print_function
385
386@@ -31,9 +31,9 @@
387 import tarfile
388 from textwrap import dedent
389
390-from click.build import ClickBuildError, ClickBuilder, ClickSourceBuilder
391-from click.preinst import static_preinst
392-from click.tests.helpers import (
393+from click_package.build import ClickBuildError, ClickBuilder, ClickSourceBuilder
394+from click_package.preinst import static_preinst
395+from click_package.tests.helpers import (
396 disable_logging,
397 mkfile,
398 TestCase,
399
400=== modified file 'click_package/tests/test_chroot.py'
401--- click/tests/test_chroot.py 2015-12-29 01:12:58 +0000
402+++ click_package/tests/test_chroot.py 2017-06-07 11:34:17 +0000
403@@ -13,7 +13,7 @@
404 # You should have received a copy of the GNU General Public License
405 # along with this program. If not, see <http://www.gnu.org/licenses/>.
406
407-"""Unit tests for click.chroot."""
408+"""Unit tests for click_package.chroot."""
409
410 from __future__ import print_function
411
412@@ -26,12 +26,12 @@
413 import re
414 from textwrap import dedent
415
416-from click.chroot import (
417+from click_package.chroot import (
418 ClickChroot,
419 generate_sources,
420 strip_dev_series_from_framework,
421 )
422-from click.tests.helpers import TestCase, mock
423+from click_package.tests.helpers import TestCase, mock
424
425
426 class FakeClickChroot(ClickChroot):
427
428=== modified file 'click_package/tests/test_database.py'
429--- click/tests/test_database.py 2015-10-15 11:47:35 +0000
430+++ click_package/tests/test_database.py 2017-06-07 11:34:17 +0000
431@@ -13,7 +13,7 @@
432 # You should have received a copy of the GNU General Public License
433 # along with this program. If not, see <http://www.gnu.org/licenses/>.
434
435-"""Unit tests for click.database."""
436+"""Unit tests for click_package.database."""
437
438 from __future__ import print_function
439
440@@ -34,9 +34,9 @@
441 from gi.repository import Click, GLib
442 from six import integer_types
443
444-from click.json_helpers import json_array_to_python, json_object_to_python
445-from click.tests.gimock_types import Passwd
446-from click.tests.helpers import TestCase, mkfile, touch
447+from click_package.json_helpers import json_array_to_python, json_object_to_python
448+from click_package.tests.gimock_types import Passwd
449+from click_package.tests.helpers import TestCase, mkfile, touch
450
451
452 class TestClickInstalledPackage(TestCase):
453
454=== modified file 'click_package/tests/test_framework.py'
455--- click/tests/test_framework.py 2014-07-09 12:56:21 +0000
456+++ click_package/tests/test_framework.py 2017-06-07 11:34:17 +0000
457@@ -13,7 +13,7 @@
458 # You should have received a copy of the GNU General Public License
459 # along with this program. If not, see <http://www.gnu.org/licenses/>.
460
461-"""Unit tests for click.framework."""
462+"""Unit tests for click_package.framework."""
463
464 from __future__ import print_function
465
466@@ -27,7 +27,7 @@
467
468 from gi.repository import Click
469
470-from click.tests.helpers import TestCase, touch
471+from click_package.tests.helpers import TestCase, touch
472
473
474 class TestClickFramework(TestCase):
475
476=== modified file 'click_package/tests/test_hooks.py'
477--- click/tests/test_hooks.py 2016-08-28 00:41:18 +0000
478+++ click_package/tests/test_hooks.py 2017-06-07 11:34:17 +0000
479@@ -13,7 +13,7 @@
480 # You should have received a copy of the GNU General Public License
481 # along with this program. If not, see <http://www.gnu.org/licenses/>.
482
483-"""Unit tests for click.hooks."""
484+"""Unit tests for click_package.hooks."""
485
486 from __future__ import print_function
487
488@@ -35,8 +35,8 @@
489
490 from gi.repository import Click, GLib
491
492-from click.tests.gimock_types import Passwd
493-from click.tests.helpers import TestCase, mkfile, mkfile_utf8
494+from click_package.tests.gimock_types import Passwd
495+from click_package.tests.helpers import TestCase, mkfile, mkfile_utf8
496
497
498 class TestClickPatternFormatter(TestCase):
499
500=== modified file 'click_package/tests/test_install.py'
501--- click/tests/test_install.py 2015-12-11 01:15:20 +0000
502+++ click_package/tests/test_install.py 2017-06-07 11:34:17 +0000
503@@ -13,7 +13,7 @@
504 # You should have received a copy of the GNU General Public License
505 # along with this program. If not, see <http://www.gnu.org/licenses/>.
506
507-"""Unit tests for click.install."""
508+"""Unit tests for click_package.install."""
509
510 from __future__ import print_function
511
512@@ -40,22 +40,22 @@
513 from debian.deb822 import Deb822
514 from gi.repository import Click
515
516-from click.arfile import ArFile
517-from click.build import ClickBuilder
518-from click.install import (
519+from click_package.arfile import ArFile
520+from click_package.build import ClickBuilder
521+from click_package.install import (
522 ClickInstaller,
523 ClickInstallerAuditError,
524 ClickInstallerPermissionDenied,
525 )
526-from click.preinst import static_preinst
527-from click.tests.helpers import (
528+from click_package.preinst import static_preinst
529+from click_package.tests.helpers import (
530 disable_logging,
531 mkfile,
532 mock,
533 TestCase,
534 touch,
535 )
536-from click.versions import spec_version
537+from click_package.versions import spec_version
538
539
540 @contextmanager
541@@ -82,7 +82,7 @@
542 self.db = Click.DB()
543 self.db.add(self.temp_dir)
544 # mock signature checks during the tests
545- self.debsig_patcher = mock.patch("click.install.DebsigVerify")
546+ self.debsig_patcher = mock.patch("click_package.install.DebsigVerify")
547 self.debsig_patcher.start()
548
549 def tearDown(self):
550@@ -652,7 +652,7 @@
551 os.path.exists(ClickInstaller(None)._preload_path()),
552 "preload bits not built; installing packages will fail")
553 @mock.patch("gi.repository.Click.package_install_hooks")
554- @mock.patch("click.install.ClickInstaller._dpkg_architecture")
555+ @mock.patch("click_package.install.ClickInstaller._dpkg_architecture")
556 def test_single_architecture(self, mock_dpkg_architecture,
557 mock_package_install_hooks):
558 with self.run_in_subprocess(
559@@ -689,7 +689,7 @@
560 os.path.exists(ClickInstaller(None)._preload_path()),
561 "preload bits not built; installing packages will fail")
562 @mock.patch("gi.repository.Click.package_install_hooks")
563- @mock.patch("click.install.ClickInstaller._dpkg_architecture")
564+ @mock.patch("click_package.install.ClickInstaller._dpkg_architecture")
565 def test_multiple_architectures(self, mock_dpkg_architecture,
566 mock_package_install_hooks):
567 with self.run_in_subprocess(
568
569=== modified file 'click_package/tests/test_osextras.py'
570--- click/tests/test_osextras.py 2014-07-09 12:56:21 +0000
571+++ click_package/tests/test_osextras.py 2017-06-07 11:34:17 +0000
572@@ -13,7 +13,7 @@
573 # You should have received a copy of the GNU General Public License
574 # along with this program. If not, see <http://www.gnu.org/licenses/>.
575
576-"""Unit tests for click.osextras."""
577+"""Unit tests for click_package.osextras."""
578
579 from __future__ import print_function
580 __all__ = [
581@@ -26,8 +26,8 @@
582
583 from gi.repository import Click, GLib
584
585-from click import osextras
586-from click.tests.helpers import TestCase, mock, touch
587+from click_package import osextras
588+from click_package.tests.helpers import TestCase, mock, touch
589
590
591 class TestOSExtrasBaseMixin:
592
593=== modified file 'click_package/tests/test_paths.py.in'
594--- click/tests/test_paths.py.in 2014-07-09 12:56:21 +0000
595+++ click_package/tests/test_paths.py.in 2017-06-07 11:34:17 +0000
596@@ -28,7 +28,7 @@
597
598 from gi.repository import Click
599
600-from click.tests.helpers import TestCase
601+from click_package.tests.helpers import TestCase
602
603
604 class TestClickPaths(TestCase):
605
606=== modified file 'click_package/tests/test_query.py'
607--- click/tests/test_query.py 2014-03-03 21:43:10 +0000
608+++ click_package/tests/test_query.py 2017-06-07 11:34:17 +0000
609@@ -13,7 +13,7 @@
610 # You should have received a copy of the GNU General Public License
611 # along with this program. If not, see <http://www.gnu.org/licenses/>.
612
613-"""Unit tests for click.query."""
614+"""Unit tests for click_package.query."""
615
616 from __future__ import print_function
617 __all__ = [
618@@ -25,7 +25,7 @@
619
620 from gi.repository import Click
621
622-from click.tests.helpers import TestCase, touch
623+from click_package.tests.helpers import TestCase, touch
624
625
626 class TestQuery(TestCase):
627
628=== modified file 'click_package/tests/test_scripts.py'
629--- click/tests/test_scripts.py 2013-06-27 14:30:15 +0000
630+++ click_package/tests/test_scripts.py 2017-06-07 11:34:17 +0000
631@@ -24,7 +24,7 @@
632 import subprocess
633 from unittest import skipIf
634
635-from click.tests.helpers import TestCase
636+from click_package.tests.helpers import TestCase
637
638
639 class TestScripts(TestCase):
640
641=== modified file 'click_package/tests/test_static.py'
642--- click/tests/test_static.py 2013-06-27 14:30:15 +0000
643+++ click_package/tests/test_static.py 2017-06-07 11:34:17 +0000
644@@ -41,13 +41,13 @@
645 pyflakes = None
646
647
648-from click.tests.helpers import TestCase
649+from click_package.tests.helpers import TestCase
650
651
652 class TestStatic(TestCase):
653 def all_paths(self):
654 paths = []
655- start_dir = os.path.dirname(resource_filename('click', '__init__.py'))
656+ start_dir = os.path.dirname(resource_filename('click_package', '__init__.py'))
657 for dirpath, dirnames, filenames in os.walk(start_dir):
658 for ignore in ('doc', ".bzr", "__pycache__"):
659 if ignore in dirnames:
660
661=== modified file 'click_package/tests/test_user.py'
662--- click/tests/test_user.py 2014-10-02 06:57:37 +0000
663+++ click_package/tests/test_user.py 2017-06-07 11:34:17 +0000
664@@ -13,7 +13,7 @@
665 # You should have received a copy of the GNU General Public License
666 # along with this program. If not, see <http://www.gnu.org/licenses/>.
667
668-"""Unit tests for click.user."""
669+"""Unit tests for click_package.user."""
670
671 from __future__ import print_function
672
673@@ -30,9 +30,9 @@
674
675 from gi.repository import Click, GLib
676
677-from click.json_helpers import json_array_to_python, json_object_to_python
678-from click.tests.gimock_types import Passwd
679-from click.tests.helpers import (
680+from click_package.json_helpers import json_array_to_python, json_object_to_python
681+from click_package.tests.gimock_types import Passwd
682+from click_package.tests.helpers import (
683 TestCase,
684 make_installed_click,
685 mkfile,
686
687=== modified file 'configure.ac'
688--- configure.ac 2014-06-30 16:48:31 +0000
689+++ configure.ac 2017-06-07 11:34:17 +0000
690@@ -131,9 +131,9 @@
691
692 AC_CONFIG_FILES([
693 Makefile
694- click/Makefile
695- click/tests/Makefile
696- click/tests/config.py
697+ click_package/Makefile
698+ click_package/tests/Makefile
699+ click_package/tests/config.py
700 conf/Makefile
701 conf/databases/Makefile
702 conf/databases/99_default.conf
703
704=== modified file 'debian/changelog'
705--- debian/changelog 2016-09-16 17:46:25 +0000
706+++ debian/changelog 2017-06-07 11:34:17 +0000
707@@ -1,3 +1,10 @@
708+click (0.4.46-0ubuntu1) UNRELEASED; urgency=medium
709+
710+ * Rename the python package this installs from click to click_package.
711+ (LP: #1693226)
712+
713+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Fri, 26 May 2017 13:03:44 -0300
714+
715 click (0.4.45.1+16.10.20160916-0ubuntu1) yakkety; urgency=medium
716
717 * Kill gpg-agent (if possible) after running debsigs in integration tests.
718
719=== modified file 'debian/control'
720--- debian/control 2016-08-28 20:59:24 +0000
721+++ debian/control 2017-06-07 11:34:17 +0000
722@@ -40,7 +40,6 @@
723 Section: python
724 Architecture: any
725 Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-click-0.4 (= ${binary:Version}), gir1.2-glib-2.0, python3-apt, python3-debian, python3-gi
726-Conflicts: python3-click, python3-click-cli
727 Replaces: python3-click (<< 0.4.43)
728 Description: Click packages (Python 3 interface)
729 Click is a simplified packaging format that installs in a separate part of
730
731=== modified file 'debian/tests/run-tests.sh'
732--- debian/tests/run-tests.sh 2016-08-10 12:33:34 +0000
733+++ debian/tests/run-tests.sh 2017-06-07 11:34:17 +0000
734@@ -10,4 +10,4 @@
735 --with-systemduserunitdir=/usr/lib/systemd/user \
736 --disable-packagekit
737
738-TEST_INTEGRATION=1 python3 -m unittest discover -vv click.tests.integration
739+TEST_INTEGRATION=1 python3 -m unittest discover -vv click_package.tests.integration
740
741=== modified file 'doc/index.rst'
742--- doc/index.rst 2015-05-01 07:28:16 +0000
743+++ doc/index.rst 2017-06-07 11:34:17 +0000
744@@ -84,11 +84,11 @@
745
746 To run a specific testcase, use the standard python unittest syntax like::
747
748- $ python3 -m unittest click.tests.test_install
749+ $ python3 -m unittest click_package.tests.test_install
750
751 or::
752
753- $ python2 -m unittest click.tests.test_build.TestClickBuilder.test_build
754+ $ python2 -m unittest click_package.tests.test_build.TestClickBuilder.test_build
755
756 Test coverage
757 -------------
758@@ -130,7 +130,7 @@
759 GI_TYPELIB_PATH=$(pwd)/lib/click \
760 CLICK_BINARY=$(pwd)/bin/click \
761 TEST_INTEGRATION=1 \
762- python3 -m unittest discover click.tests.integration
763+ python3 -m unittest discover click_package.tests.integration
764
765 to run against the build tree.
766
767
768=== modified file 'setup.py.in'
769--- setup.py.in 2014-06-30 16:48:31 +0000
770+++ setup.py.in 2017-06-07 11:34:17 +0000
771@@ -29,7 +29,7 @@
772 coverage_executable = "python3-coverage"
773 self.spawn([
774 coverage_executable, "run", "-m", "unittest",
775- "discover", "-vv", "click.tests"])
776+ "discover", "-vv", "click_package.tests"])
777 self.spawn([coverage_executable, "combine"])
778 self.spawn([
779 coverage_executable, "xml", "-o", "coverage-python.xml"])
780@@ -49,5 +49,5 @@
781 scripts=['bin/click'],
782 install_requires=requirements,
783 cmdclass={"test": test_extra},
784- test_suite="click.tests",
785+ test_suite="click_package.tests",
786 )
787
788=== modified file 'tox.ini'
789--- tox.ini 2014-03-03 12:44:14 +0000
790+++ tox.ini 2017-06-07 11:34:17 +0000
791@@ -1,6 +1,6 @@
792 [tox]
793-envlist = py27,py32,py33,py34
794+envlist = py27,py32,py33,py34,py35,py36
795
796 [testenv]
797-commands = python -m unittest discover -vv click.tests
798+commands = python -m unittest discover -vv click_package.tests
799 sitepackages = True

Subscribers

People subscribed via source and target branches

to all changes: