Merge lp://staging/~frankban/charms/trusty/juju-gui/new-jujubundlelib into lp://staging/~juju-gui/charms/trusty/juju-gui/trunk

Reviewers: mp+257648_code.launchpad.net,

Message:
Please take a look.

Description:
Update to new jujubundlelib 0.1.5.

https://code.launchpad.net/~frankban/charms/trusty/juju-gui/new-jujubundlelib/+merge/257648

(do not edit description out of merge proposal)

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

Affected files (+9, -6 lines):
   A [revision details]
   D deps/jujubundlelib-0.1.3.tar.gz
   A deps/jujubundlelib-0.1.5.tar.gz
   M server-requirements.pip
   M server/guiserver/tests/bundles/test_views.py

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: server-requirements.pip
=== modified file 'server-requirements.pip'
--- server-requirements.pip 2015-04-22 14:54:14 +0000
+++ server-requirements.pip 2015-04-28 15:27:47 +0000
@@ -34,4 +34,4 @@
  # dependency.
  juju-deployer==0.4.4
  charmworldlib==0.3.0
-jujubundlelib==0.1.3
+jujubundlelib==0.1.5

Index: deps/jujubundlelib-0.1.3.tar.gz
=== removed file 'deps/jujubundlelib-0.1.3.tar.gz'
Binary files deps/jujubundlelib-0.1.3.tar.gz 2015-04-22 14:54:14 +0000 and
deps/jujubundlelib-0.1.3.tar.gz 1970-01-01 00:00:00 +0000 differ

Index: deps/jujubundlelib-0.1.5.tar.gz
=== added file 'deps/jujubundlelib-0.1.5.tar.gz'
Binary files deps/jujubundlelib-0.1.5.tar.gz 1970-01-01 00:00:00 +0000 and
deps/jujubundlelib-0.1.5.tar.gz 2015-04-28 15:27:47 +0000 differ

Index: server/guiserver/tests/bundles/test_views.py
=== modified file 'server/guiserver/tests/bundles/test_views.py'
--- server/guiserver/tests/bundles/test_views.py 2015-04-23 08:56:37 +0000
+++ server/guiserver/tests/bundles/test_views.py 2015-04-28 15:27:47 +0000
@@ -771,19 +771,20 @@
      def test_invalid_bundle(self):
          # The validation errors are returned when providing an invalid
bundle.
          content = yaml.safe_dump({
- 'services': {'django': {'charm': 'bad:wolf'}},
- 'machines': {'1': {}, 'invalid': {}},
+ 'services': {'django':
{'charm': 'bad:wolf', 'num_units': 'bad'}},
+ 'machines': {'1': {'constraints': 42}, '2':
{'series': 'no:such'}},
          })
          request = self.make_view_request(params={'YAML': content})
          expected_response = {
              'Response': {
                  'Errors': [
- 'machine invalid has an invalid id, must be digit',
- 'invalid charm specified for service django: URL has '
- 'invalid schema: bad',
- 'num_units for service django must be an integer',
+ 'invalid charm specified for service django: '
+ 'URL has invalid schema: bad',
+ 'num_units for service django must be a digit',
                      'machine 1 not referred to by a placement directive',
- 'machine invalid not referred to by a placement
directive',
+ 'machine 2 not refe...

LGTM thanks for updating this

https://codereview.appspot.com/232050043/

*** Submitted:

Update to new jujubundlelib 0.1.5.

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

https://codereview.appspot.com/232050043/

On 2015/04/28 15:30:45, matthew.scott wrote:
> LGTM thanks for updating this

Thanks for the review!

https://codereview.appspot.com/232050043/