Merge lp:~frankban/juju-quickstart/update-deps into lp:juju-quickstart

[Francesco Banconi]

Update requirements.

Make quickstart use the newer python-jujuclient
included in trusty.

https://codereview.appspot.com/74610043/

[Francesco Banconi (frankban)]

Reviewers: mp+210580_code.launchpad.net,

Message:
Please take a look.

Description:
Update requirements.

Make quickstart use the newer python-jujuclient
included in trusty.

https://code.launchpad.net/~frankban/juju-quickstart/update-deps/+merge/210580

(do not edit description out of merge proposal)

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

Affected files (+9, -26 lines):
   A [revision details]
   M quickstart/__init__.py
   M quickstart/juju.py
   M quickstart/settings.py
   M quickstart/tests/test_juju.py
   M requirements.pip
   M test-requirements.pip

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: requirements.pip
=== modified file 'requirements.pip'
--- requirements.pip 2013-12-16 16:38:20 +0000
+++ requirements.pip 2014-03-12 10:10:21 +0000
@@ -21,6 +21,6 @@
  # formatted dependencies. Do not include other pip specific requirement
  # specifications (e.g. -e ... or -r ...).

-jujuclient==0.11
+jujuclient==0.17.5
  PyYAML==3.10
  urwid==1.1.1

Index: test-requirements.pip
=== modified file 'test-requirements.pip'
--- test-requirements.pip 2013-11-14 10:32:15 +0000
+++ test-requirements.pip 2014-03-12 10:10:21 +0000
@@ -16,8 +16,8 @@
  # You should have received a copy of the GNU Affero General Public License
  # along with this program. If not, see <http://www.gnu.org/licenses/>.

-coverage==3.7
-flake8==2.0
+coverage==3.7.1
+flake8==2.1.0
  mock==1.0.1
-nose==1.3.0
+nose==1.3.1
  -r requirements.pip

Index: quickstart/__init__.py
=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py 2014-03-11 12:34:06 +0000
+++ quickstart/__init__.py 2014-03-12 10:10:21 +0000
@@ -22,7 +22,7 @@
  from __future__ import unicode_literals

-VERSION = (1, 1, 1)
+VERSION = (1, 1, 2)

  def get_version():

Index: quickstart/juju.py
=== modified file 'quickstart/juju.py'
--- quickstart/juju.py 2013-12-06 17:17:19 +0000
+++ quickstart/juju.py 2014-03-12 10:10:21 +0000
@@ -41,26 +41,6 @@
      deployments to specific machines.
      """

- def add_unit(self, service_name, machine_spec=None):
- """Add a unit to the given service and machine.
-
- This method is present in newer versions of python-jujuclient and
can
- be safely deleted when upgrading to the new releases.
- """
- # XXX frankban 2013-11-15: remove this method when upgrading to
- # python-jujuclient >= 0.15.
- params = {
- 'ServiceName': service_name,
- 'NumUnits': 1,
- }
- if machine_spec is not None:
- params['ToMachineSpec'] = machine_spec
- return self._rpc({
- 'Type': 'Client',
- 'Request': 'AddServiceUnits',
- 'Params': params,
- })
-
      def deploy_bundle(self, yaml, name=None, bundle_id=None):
          """Deploy a bundle."""
          params = {'YAML': yaml}

Index: quickstart/settings.py
=== modifie...

[Richard Harding (rharding)]

LGTM do you need a QA on this?

https://codereview.appspot.com/74610043/diff/1/quickstart/juju.py
File quickstart/juju.py (left):

https://codereview.appspot.com/74610043/diff/1/quickstart/juju.py#oldcode44
quickstart/juju.py:44: def add_unit(self, service_name,
machine_spec=None):
yay!

https://codereview.appspot.com/74610043/

[Francesco Banconi (frankban)]

*** Submitted:

Update requirements.

Make quickstart use the newer python-jujuclient
included in trusty.

R=rharding
CC=
https://codereview.appspot.com/74610043

https://codereview.appspot.com/74610043/

=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py	2014-03-11 12:34:06 +0000
+++ quickstart/__init__.py	2014-03-12 10:57:39 +0000
@@ -22,7 +22,7 @@
 from __future__ import unicode_literals
 
 
-VERSION = (1, 1, 1)
+VERSION = (1, 1, 2)
 
 
 def get_version():

=== modified file 'quickstart/juju.py'
--- quickstart/juju.py	2013-12-06 17:17:19 +0000
+++ quickstart/juju.py	2014-03-12 10:57:39 +0000
@@ -41,26 +41,6 @@
     deployments to specific machines.
     """
 
-    def add_unit(self, service_name, machine_spec=None):
-        """Add a unit to the given service and machine.
-
-        This method is present in newer versions of python-jujuclient and can
-        be safely deleted when upgrading to the new releases.
-        """
-        # XXX frankban 2013-11-15: remove this method when upgrading to
-        # python-jujuclient >= 0.15.
-        params = {
-            'ServiceName': service_name,
-            'NumUnits': 1,
-        }
-        if machine_spec is not None:
-            params['ToMachineSpec'] = machine_spec
-        return self._rpc({
-            'Type': 'Client',
-            'Request': 'AddServiceUnits',
-            'Params': params,
-        })
-
     def deploy_bundle(self, yaml, name=None, bundle_id=None):
         """Deploy a bundle."""
         params = {'YAML': yaml}

=== modified file 'quickstart/settings.py'
--- quickstart/settings.py	2014-03-11 12:34:06 +0000
+++ quickstart/settings.py	2014-03-12 10:57:39 +0000
@@ -26,7 +26,7 @@
 
 # The default Juju GUI charm URL to use when it is not possible to retrieve it
 # from the charmworld API, e.g. due to temporary connection/charmworld errors.
-DEFAULT_CHARM_URL = 'cs:precise/juju-gui-83'
+DEFAULT_CHARM_URL = 'cs:precise/juju-gui-85'
 
 # The quickstart app short description.
 DESCRIPTION = 'set up a Juju environment (including the GUI) in very few steps'

=== modified file 'quickstart/tests/test_juju.py'
--- quickstart/tests/test_juju.py	2013-12-06 17:17:19 +0000
+++ quickstart/tests/test_juju.py	2014-03-12 10:57:39 +0000
@@ -94,6 +94,7 @@
             'NumUnits': 1,
             'Config': {},
             'Constraints': {},
+            'ToMachineSpec': None,
         }
         params.update(kwargs)
         return {

=== modified file 'requirements.pip'
--- requirements.pip	2013-12-16 16:38:20 +0000
+++ requirements.pip	2014-03-12 10:57:39 +0000
@@ -21,6 +21,6 @@
 # formatted dependencies. Do not include other pip specific requirement
 # specifications (e.g. -e ... or -r ...).
 
-jujuclient==0.11
+jujuclient==0.17.5
 PyYAML==3.10
 urwid==1.1.1

=== modified file 'test-requirements.pip'
--- test-requirements.pip	2013-11-14 10:32:15 +0000
+++ test-requirements.pip	2014-03-12 10:57:39 +0000
@@ -16,8 +16,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-coverage==3.7
-flake8==2.0
+coverage==3.7.1
+flake8==2.1.0
 mock==1.0.1
-nose==1.3.0
+nose==1.3.1
 -r requirements.pip