juju-quickstart

Merge lp:~frankban/juju-quickstart/bundlelib-019 into lp:juju-quickstart

  1. bundlelib-019
  2. Merge into trunk
Proposed by Francesco Banconi
Status: Merged
Merged at revision: 139
Proposed branch: lp:~frankban/juju-quickstart/bundlelib-019
Merge into: lp:juju-quickstart
Diff against target: 77 lines (+7/-7)
4 files modified
HACKING.rst (+1/-1)
README.rst (+1/-1)
quickstart/__init__.py (+1/-1)
tox.ini (+4/-4)
To merge this branch: bzr merge lp:~frankban/juju-quickstart/bundlelib-019
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+267322@code.launchpad.net

Description of the change

Update to bundlelib 0.1.9.

Drop utopic support.

To post a comment you must log in.
Revision history for this message
Francesco Banconi (frankban) wrote :

Self-review: trivial.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING.rst'
2--- HACKING.rst 2015-02-26 14:39:53 +0000
3+++ HACKING.rst 2015-08-07 10:25:22 +0000
4@@ -200,7 +200,7 @@
5 make fcheck
6
7 The general steps for manual QA (until we get a continuous integration set up
8-with functional tests) should be run on trusty, utopic and vivid.
9+with functional tests) should be run on trusty, vivid and wily.
10
11 * Ensure juju-quickstart is installed from the juju-gui/quickstart-beta PPA.::
12
13
14=== modified file 'README.rst'
15--- README.rst 2015-01-13 12:03:15 +0000
16+++ README.rst 2015-08-07 10:25:22 +0000
17@@ -34,7 +34,7 @@
18 ------------------
19
20 Juju Quickstart is available on Ubuntu releases 12.04 LTS (precise), 14.04 LTS
21-(trusty), 14.10 (utopic), 15.04 (vivid) and on OS X (10.7 and later).
22+(trusty), 15.04 (vivid) and on OS X (10.7 and later).
23
24 Starting from version 1.5.0, Juju Quickstart only supports Juju >= 1.18.1.
25
26
27=== modified file 'quickstart/__init__.py'
28--- quickstart/__init__.py 2015-05-26 13:38:16 +0000
29+++ quickstart/__init__.py 2015-08-07 10:25:22 +0000
30@@ -45,7 +45,7 @@
31 Once Juju has been installed, the command can also be run as a juju plugin,
32 without the hyphen ("juju quickstart").
33 """
34-VERSION = (2, 2, 0)
35+VERSION = (2, 2, 1)
36
37
38 def get_version():
39
40=== modified file 'tox.ini'
41--- tox.ini 2015-05-26 14:40:22 +0000
42+++ tox.ini 2015-08-07 10:25:22 +0000
43@@ -72,7 +72,7 @@
44 # See https://launchpad.net/~juju/+archive/ubuntu/stable.
45 websocket-client==0.18.0
46 jujuclient==0.50.1
47- jujubundlelib==0.1.8
48+ jujubundlelib==0.1.9
49 urwid==1.2.1
50 # The distribution PyYAML requirement is used in this case.
51
52@@ -82,7 +82,7 @@
53 # Ubuntu 14.04 (trusty) distro dependencies.
54 websocket-client==0.12.0
55 jujuclient==0.17.5
56- jujubundlelib==0.1.8
57+ jujubundlelib==0.1.9
58 PyYAML==3.10
59 urwid==1.1.1
60
61@@ -92,7 +92,7 @@
62 # Ubuntu 14.10 (utopic) distro dependencies.
63 websocket-client==0.12.0
64 jujuclient==0.17.5
65- jujubundlelib==0.1.8
66+ jujubundlelib==0.1.9
67 PyYAML==3.11
68 urwid==1.2.1
69
70@@ -102,7 +102,7 @@
71 # Ubuntu 15.04 (vivid) distro dependencies.
72 websocket-client==0.18.0
73 jujuclient==0.18.5
74- jujubundlelib==0.1.8
75+ jujubundlelib==0.1.9
76 PyYAML==3.11
77 urwid==1.2.1
78

Subscribers

People subscribed via source and target branches