Merge lp:~kissiel/checkbox/cbt-release into lp:checkbox

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 3930
Merged at revision: 3929
Proposed branch: lp:~kissiel/checkbox/cbt-release
Merge into: lp:checkbox
Diff against target: 47 lines (+6/-6)
3 files modified
checkbox-touch/get-libs (+1/-1)
checkbox-touch/manifest.json (+2/-2)
checkbox-touch/py/checkbox_touch.py (+3/-3)
To merge this branch: bzr merge lp:~kissiel/checkbox/cbt-release
Reviewer Review Type Date Requested Status
Maciej Kisielewski Approve
Review via email: mp+266558@code.launchpad.net

Description of the change

Checkbox-Touch release - version 1.2.1

To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

Self approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'checkbox-touch/get-libs'
--- checkbox-touch/get-libs 2015-07-17 10:11:05 +0000
+++ checkbox-touch/get-libs 2015-07-31 13:48:19 +0000
@@ -155,7 +155,7 @@
155 preserve_symlinks=1)155 preserve_symlinks=1)
156156
157157
158def get_plainbox_from_pypi(version='0.21.2'):158def get_plainbox_from_pypi(version='0.22.2'):
159 # plaibox_pypi contains URL from which to download plainbox159 # plaibox_pypi contains URL from which to download plainbox
160 plainbox_pypi = ('https://pypi.python.org/packages/source'160 plainbox_pypi = ('https://pypi.python.org/packages/source'
161 '/p/plainbox/plainbox-{}.tar.gz'.format(version))161 '/p/plainbox/plainbox-{}.tar.gz'.format(version))
162162
=== modified file 'checkbox-touch/manifest.json'
--- checkbox-touch/manifest.json 2015-07-23 10:48:33 +0000
+++ checkbox-touch/manifest.json 2015-07-31 13:48:19 +0000
@@ -11,9 +11,9 @@
11 "maintainer": "Zygmunt Krynicki <zkrynicki@ubuntu.com>",11 "maintainer": "Zygmunt Krynicki <zkrynicki@ubuntu.com>",
12 "name": "com.ubuntu.checkbox",12 "name": "com.ubuntu.checkbox",
13 "title": "Checkbox",13 "title": "Checkbox",
14 "version": "1.2",14 "version": "1.2.1",
15 "x-source": {15 "x-source": {
16 "vcs-bzr": "lp:checkbox",16 "vcs-bzr": "lp:checkbox",
17 "vcs-bzr-revno": "checkbox-touch-v1.2.0"17 "vcs-bzr-revno": "checkbox-touch-v1.2.1"
18 }18 }
19}19}
2020
=== modified file 'checkbox-touch/py/checkbox_touch.py'
--- checkbox-touch/py/checkbox_touch.py 2015-07-23 12:27:07 +0000
+++ checkbox-touch/py/checkbox_touch.py 2015-07-31 13:48:19 +0000
@@ -147,11 +147,11 @@
147 response data to alter the user interface.147 response data to alter the user interface.
148 """148 """
149149
150 __version__ = (1, 2, 0, 'final', 0)150 __version__ = (1, 2, 1, 'final', 0)
151151
152 def __init__(self):152 def __init__(self):
153 if plainbox.__version__ < (0, 21):153 if plainbox.__version__ < (0, 22):
154 raise SystemExit("plainbox 0.21 required, you have {}".format(154 raise SystemExit("plainbox 0.22 required, you have {}".format(
155 ToolBase.format_version_tuple(plainbox.__version__)))155 ToolBase.format_version_tuple(plainbox.__version__)))
156 # adjust_logging(logging.INFO, ['checkbox.touch'], True)156 # adjust_logging(logging.INFO, ['checkbox.touch'], True)
157 self.manager = None157 self.manager = None

Subscribers

People subscribed via source and target branches