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

Proposed by Francesco Banconi
Status: Merged
Merged at revision: 145
Proposed branch: lp:~frankban/juju-quickstart/bundlelib-032
Merge into: lp:juju-quickstart
Diff against target: 60 lines (+6/-6)
2 files modified
quickstart/tests/models/test_bundles.py (+2/-2)
tox.ini (+4/-4)
To merge this branch: bzr merge lp:~frankban/juju-quickstart/bundlelib-032
Reviewer Review Type Date Requested Status
Francesco Banconi Approve
Review via email: mp+278932@code.launchpad.net

Description of the change

Update to jujubundlelib 0.3.2.

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

Self-review: trivial.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'quickstart/tests/models/test_bundles.py'
--- quickstart/tests/models/test_bundles.py 2015-10-28 09:33:57 +0000
+++ quickstart/tests/models/test_bundles.py 2015-11-30 09:24:17 +0000
@@ -82,7 +82,7 @@
82 'requires': []},82 'requires': []},
83 {'id': 'deploy-1',83 {'id': 'deploy-1',
84 'method': 'deploy',84 'method': 'deploy',
85 'args': ['$addCharm-0', 'mysql', {}, ''],85 'args': ['$addCharm-0', 'mysql', {}, '', {}],
86 'requires': ['addCharm-0']},86 'requires': ['addCharm-0']},
87 {'id': 'addCharm-2',87 {'id': 'addCharm-2',
88 'method': 'addCharm',88 'method': 'addCharm',
@@ -90,7 +90,7 @@
90 'requires': []},90 'requires': []},
91 {'id': 'deploy-3',91 {'id': 'deploy-3',
92 'method': 'deploy',92 'method': 'deploy',
93 'args': ['$addCharm-2', 'wordpress', {}, ''],93 'args': ['$addCharm-2', 'wordpress', {}, '', {}],
94 'requires': ['addCharm-2']},94 'requires': ['addCharm-2']},
95 {'id': 'addUnit-4',95 {'id': 'addUnit-4',
96 'method': 'addUnit',96 'method': 'addUnit',
9797
=== modified file 'tox.ini'
--- tox.ini 2015-11-23 14:57:26 +0000
+++ tox.ini 2015-11-30 09:24:17 +0000
@@ -72,7 +72,7 @@
72 # See https://launchpad.net/~juju/+archive/ubuntu/stable.72 # See https://launchpad.net/~juju/+archive/ubuntu/stable.
73 websocket-client==0.18.073 websocket-client==0.18.0
74 jujuclient==0.50.374 jujuclient==0.50.3
75 jujubundlelib==0.3.075 jujubundlelib==0.3.2
76 urwid==1.2.176 urwid==1.2.1
77 # The distribution PyYAML requirement is used in this case.77 # The distribution PyYAML requirement is used in this case.
7878
@@ -82,7 +82,7 @@
82 # Ubuntu 14.04 (trusty) distro dependencies.82 # Ubuntu 14.04 (trusty) distro dependencies.
83 websocket-client==0.12.083 websocket-client==0.12.0
84 jujuclient==0.17.584 jujuclient==0.17.5
85 jujubundlelib==0.3.085 jujubundlelib==0.3.2
86 PyYAML==3.1086 PyYAML==3.10
87 urwid==1.1.187 urwid==1.1.1
8888
@@ -92,7 +92,7 @@
92 # Ubuntu 15.04 (vivid) distro dependencies.92 # Ubuntu 15.04 (vivid) distro dependencies.
93 websocket-client==0.18.093 websocket-client==0.18.0
94 jujuclient==0.18.594 jujuclient==0.18.5
95 jujubundlelib==0.3.095 jujubundlelib==0.3.2
96 PyYAML==3.1196 PyYAML==3.11
97 urwid==1.2.197 urwid==1.2.1
9898
@@ -102,7 +102,7 @@
102 # Ubuntu 15.10 (wily) distro dependencies.102 # Ubuntu 15.10 (wily) distro dependencies.
103 websocket-client==0.18.0103 websocket-client==0.18.0
104 jujuclient==0.50.1104 jujuclient==0.50.1
105 jujubundlelib==0.3.0105 jujubundlelib==0.3.2
106 PyYAML==3.11106 PyYAML==3.11
107 urwid==1.2.1107 urwid==1.2.1
108108

Subscribers

People subscribed via source and target branches