juju-quickstart

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

  1. new-jujubundlelib-015
  2. Merge into trunk
Proposed by Francesco Banconi
Status: Merged
Merged at revision: 128
Proposed branch: lp:~frankban/juju-quickstart/new-jujubundlelib-015
Merge into: lp:juju-quickstart
Diff against target: 55 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/new-jujubundlelib-015
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+257657@code.launchpad.net

Description of the change

Update to new jujubundlelib 0.1.5.

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

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

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):

Revision history for this message
Madison Scott-Clary (makyo) wrote :

LGTM thanks!

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

Revision history for this message
Francesco Banconi (frankban) wrote :

*** Submitted:

Update to new jujubundlelib 0.1.5.

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

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

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-04-24 13:31:28 +0000
+++ quickstart/tests/models/test_bundles.py 2015-04-28 15:44:55 +0000
@@ -706,10 +706,10 @@
706 expected_error = (706 expected_error = (
707 'invalid bundle data:\n'707 'invalid bundle data:\n'
708 ' no charm specified for service django\n'708 ' no charm specified for service django\n'
709 ' num_units for service django must be an integer\n'709 ' num_units for service django must be a digit\n'
710 ' machine 1 not referred to by a placement directive')710 ' machine 1 not referred to by a placement directive')
711 data = {711 data = {
712 'services': {'django': {}},712 'services': {'django': {'num_units': 'exterminate'}},
713 'machines': {'1': {}},713 'machines': {'1': {}},
714 }714 }
715 with self.assert_value_error(expected_error):715 with self.assert_value_error(expected_error):
716716
=== 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 @@
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.174 jujuclient==0.50.1
75 jujubundlelib==0.1.475 jujubundlelib==0.1.5
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.1.485 jujubundlelib==0.1.5
86 PyYAML==3.1086 PyYAML==3.10
87 urwid==1.1.187 urwid==1.1.1
8888
@@ -92,7 +92,7 @@
92 # Ubuntu 14.10 (utopic) distro dependencies.92 # Ubuntu 14.10 (utopic) distro dependencies.
93 websocket-client==0.12.093 websocket-client==0.12.0
94 jujuclient==0.17.594 jujuclient==0.17.5
95 jujubundlelib==0.1.495 jujubundlelib==0.1.5
96 PyYAML==3.1196 PyYAML==3.11
97 urwid==1.2.197 urwid==1.2.1
9898
@@ -102,7 +102,7 @@
102 # Ubuntu 15.04 (vivid) distro dependencies.102 # Ubuntu 15.04 (vivid) distro dependencies.
103 websocket-client==0.18.0103 websocket-client==0.18.0
104 jujuclient==0.18.5104 jujuclient==0.18.5
105 jujubundlelib==0.1.4105 jujubundlelib==0.1.5
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