Merge lp:~frankban/juju-quickstart/new-jujubundlelib-015 into lp:juju-quickstart

[Francesco Banconi]

Update to new jujubundlelib 0.1.5.

https://codereview.appspot.com/229480043/

[Francesco Banconi (frankban)]

Reviewers: mp+257657_code.launchpad.net,

Message:
Please take a look.

Description:
Update to new jujubundlelib 0.1.5.

https://code.launchpad.net/~frankban/juju-quickstart/new-jujubundlelib-015/+merge/257657

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/229480043/

Affected files (+8, -6 lines):
   A [revision details]
   M quickstart/tests/models/test_bundles.py
   M tox.ini

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>

Index: tox.ini
=== modified file 'tox.ini'
--- tox.ini 2015-04-24 13:31:28 +0000
+++ tox.ini 2015-04-28 15:25:14 +0000
@@ -72,7 +72,7 @@
      # See https://launchpad.net/~juju/+archive/ubuntu/stable.
      websocket-client==0.18.0
      jujuclient==0.50.1
- jujubundlelib==0.1.4
+ jujubundlelib==0.1.5
      urwid==1.2.1
      # The distribution PyYAML requirement is used in this case.

@@ -82,7 +82,7 @@
      # Ubuntu 14.04 (trusty) distro dependencies.
      websocket-client==0.12.0
      jujuclient==0.17.5
- jujubundlelib==0.1.4
+ jujubundlelib==0.1.5
      PyYAML==3.10
      urwid==1.1.1

@@ -92,7 +92,7 @@
      # Ubuntu 14.10 (utopic) distro dependencies.
      websocket-client==0.12.0
      jujuclient==0.17.5
- jujubundlelib==0.1.4
+ jujubundlelib==0.1.5
      PyYAML==3.11
      urwid==1.2.1

@@ -102,7 +102,7 @@
      # Ubuntu 15.04 (vivid) distro dependencies.
      websocket-client==0.18.0
      jujuclient==0.18.5
- jujubundlelib==0.1.4
+ jujubundlelib==0.1.5
      PyYAML==3.11
      urwid==1.2.1

Index: quickstart/tests/models/test_bundles.py
=== modified file 'quickstart/tests/models/test_bundles.py'
--- quickstart/tests/models/test_bundles.py 2015-04-24 13:31:28 +0000
+++ quickstart/tests/models/test_bundles.py 2015-04-28 15:25:14 +0000
@@ -706,10 +706,10 @@
          expected_error = (
              'invalid bundle data:\n'
              ' no charm specified for service django\n'
- ' num_units for service django must be an integer\n'
+ ' num_units for service django must be a digit\n'
              ' machine 1 not referred to by a placement directive')
          data = {
- 'services': {'django': {}},
+ 'services': {'django': {'num_units': 'exterminate'}},
              'machines': {'1': {}},
          }
          with self.assert_value_error(expected_error):

[Madison Scott-Clary (makyo)]

LGTM thanks!

https://codereview.appspot.com/229480043/

[Francesco Banconi (frankban)]

*** Submitted:

Update to new jujubundlelib 0.1.5.

R=matthew.scott
CC=
https://codereview.appspot.com/229480043

https://codereview.appspot.com/229480043/

=== modified file 'quickstart/tests/models/test_bundles.py'
--- quickstart/tests/models/test_bundles.py	2015-04-24 13:31:28 +0000
+++ quickstart/tests/models/test_bundles.py	2015-04-28 15:44:55 +0000
@@ -706,10 +706,10 @@
         expected_error = (
             'invalid bundle data:\n'
             '  no charm specified for service django\n'
-            '  num_units for service django must be an integer\n'
+            '  num_units for service django must be a digit\n'
             '  machine 1 not referred to by a placement directive')
         data = {
-            'services': {'django': {}},
+            'services': {'django': {'num_units': 'exterminate'}},
             'machines': {'1': {}},
         }
         with self.assert_value_error(expected_error):

=== modified file 'tox.ini'
--- tox.ini	2015-04-24 13:31:28 +0000
+++ tox.ini	2015-04-28 15:44:55 +0000
@@ -72,7 +72,7 @@
     # See https://launchpad.net/~juju/+archive/ubuntu/stable.
     websocket-client==0.18.0
     jujuclient==0.50.1
-    jujubundlelib==0.1.4
+    jujubundlelib==0.1.5
     urwid==1.2.1
     # The distribution PyYAML requirement is used in this case.
 
@@ -82,7 +82,7 @@
     # Ubuntu 14.04 (trusty) distro dependencies.
     websocket-client==0.12.0
     jujuclient==0.17.5
-    jujubundlelib==0.1.4
+    jujubundlelib==0.1.5
     PyYAML==3.10
     urwid==1.1.1
 
@@ -92,7 +92,7 @@
     # Ubuntu 14.10 (utopic) distro dependencies.
     websocket-client==0.12.0
     jujuclient==0.17.5
-    jujubundlelib==0.1.4
+    jujubundlelib==0.1.5
     PyYAML==3.11
     urwid==1.2.1
 
@@ -102,7 +102,7 @@
     # Ubuntu 15.04 (vivid) distro dependencies.
     websocket-client==0.18.0
     jujuclient==0.18.5
-    jujubundlelib==0.1.4
+    jujubundlelib==0.1.5
     PyYAML==3.11
     urwid==1.2.1