Merge lp://qastaging/~frankban/juju-quickstart/utopic-update-dependencies into lp://qastaging/juju-quickstart
Proposed by
Francesco Banconi
Status: | Merged |
---|---|
Merged at revision: | 98 |
Proposed branch: | lp://qastaging/~frankban/juju-quickstart/utopic-update-dependencies |
Merge into: | lp://qastaging/juju-quickstart |
Diff against target: |
203 lines (+56/-30) 6 files modified
Makefile (+1/-1) quickstart/juju.py (+22/-11) quickstart/tests/helpers.py (+5/-2) quickstart/tests/test_juju.py (+22/-10) requirements.pip (+4/-4) test-requirements.pip (+2/-2) |
To merge this branch: | bzr merge lp://qastaging/~frankban/juju-quickstart/utopic-update-dependencies |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+233770@code.qastaging.launchpad.net |
Description of the change
Updated quickstart dependencies for utopic.
Quickstart now uses the dependency versions we
expect to be available in utopic.
Update the code parts in which quickstart interacts
with the juju client and the websocket Python
libraries: ensure we only log the textual WebSocket
messages we are interested in.
Also remove the deprecated --use-mirrors pip option.
Tests: `make check`
QA:
Use quickstart as usual to bootstrap local, ec2 and HP
environments: `.venv/bin/python juju-quickstart -e ...`
To post a comment you must log in.
Reviewers: mp+233770_ code.launchpad. net,
Message:
Please take a look.
Description:
Updated quickstart dependencies for utopic.
Quickstart now uses the dependency versions we
expect to be available in utopic.
Update the code parts in which quickstart interacts
with the juju client and the websocket Python
libraries: ensure we only log the textual WebSocket
messages we are interested in.
Also remove the deprecated --use-mirrors pip option.
Tests: `make check`
QA:
Use quickstart as usual to bootstrap local, ec2 and HP
environments: `.venv/bin/python juju-quickstart -e ...`
https:/ /code.launchpad .net/~frankban/ juju-quickstart /utopic- update- dependencies/ +merge/ 233770
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/139350043/
Affected files (+58, -30 lines): tests/helpers. py tests/test_ juju.py ts.pip
M Makefile
A [revision details]
M quickstart/juju.py
M quickstart/
M quickstart/
M requirements.pip
M test-requiremen
Index: Makefile
=== modified file 'Makefile'
--- Makefile 2014-04-07 09:03:11 +0000
+++ Makefile 2014-09-05 14:54:31 +0000
@@ -23,7 +23,7 @@
$(VENV_ACTIVATE): test-requiremen ts.pip requirements.pip ts.pip || \ ts.pip || \ ts.pip; exit 1)
virtualenv --distribute -p $(PYTHON) $(VENV)
- $(VENV)/bin/pip install --use-mirrors -r test-requiremen
+ $(VENV)/bin/pip install -r test-requiremen
(touch test-requiremen
@touch $(VENV_ACTIVATE)
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 client= =0.12.0 client= =0.18.0
=== modified file 'requirements.pip'
--- requirements.pip 2014-06-09 20:31:01 +0000
+++ requirements.pip 2014-09-05 14:54:31 +0000
@@ -25,7 +25,7 @@
# version of websocket-client to use. Remove websocket-client as a
dependency
# here when moving to a newer jujuclient that correctly specifies the
# version.
-websocket-
-jujuclient==0.17.5
-PyYAML==3.10
-urwid==1.1.1
+websocket-
+jujuclient==0.18.4
+PyYAML==3.11
+urwid==1.2.1
Index: test-requiremen ts.pip nts.pip' ts.pip 2014-06-09 20:31:01 +0000 ts.pip 2014-09-05 14:54:31 +0000 www.gnu. org/licenses/>.
=== modified file 'test-requireme
--- test-requiremen
+++ test-requiremen
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://
coverage==3.7.1
-flake8==2.1.0
+flake8==2.2.3
mock==1.0.1
-nose==1.3.1
+nose==1.3.4
-r requirements.pip
Index: quickstart/juju.py juju.py'
=== modified file 'quickstart/
--- quickstart/juju.py 2014-06-03 20:39:11 +0000
+++ quickstart/juju.py 2014-09-08 17:49:51 +0000
@@ -19,16 +19,23 @@
from __future__ import unicode_literals
import logging
+import ssl
import jujuclient
-import ssl
import websocket
+OPCODE_TEXT = websocket. ABNF.OPCODE_ TEXT
+# Define the options used to initiate the secure WebSocket connection.
+SSLOPT = {
+ 'cert_reqs': ssl.CERT_NONE,
+ 'ssl_version': ssl.PROTOCOL_TLSv1,
+}
+
+
def connect(api_u...