Merge lp:~frankban/juju-quickstart/fix-packaging into lp:juju-quickstart

[Francesco Banconi]

Move websocket-client to test-requirements.pip.

https://codereview.appspot.com/105820045/

[Francesco Banconi (frankban)]

Reviewers: mp+222288_code.launchpad.net,

Message:
Please take a look.

Description:
Move websocket-client to test-requirements.pip.

https://code.launchpad.net/~frankban/juju-quickstart/fix-packaging/+merge/222288

(do not edit description out of merge proposal)

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

Affected files (+9, -5 lines):
   A [revision details]
   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 2014-05-23 14:00:41 +0000
+++ requirements.pip 2014-06-06 08:46:55 +0000
@@ -21,11 +21,6 @@
  # formatted dependencies. Do not include other pip specific requirement
  # specifications (e.g. -e ... or -r ...).

-# XXX: BradCrittenden 2014-05-23: jujuclient 0.17.5 does not specify the
-# 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-client==0.12.0
  jujuclient==0.17.5
  PyYAML==3.10
  urwid==1.1.1

Index: test-requirements.pip
=== modified file 'test-requirements.pip'
--- test-requirements.pip 2014-03-12 10:10:21 +0000
+++ test-requirements.pip 2014-06-06 08:46:55 +0000
@@ -20,4 +20,11 @@
  flake8==2.1.0
  mock==1.0.1
  nose==1.3.1
+# XXX: BradCrittenden 2014-05-23: jujuclient 0.17.5 does not specify the
+# version of websocket-client to use. Remove websocket-client as a
dependency
+# here when moving to a newer jujuclient that correctly specifies the
+# version.
+# This is listed as a testing requirement so that, when dh_python2
translates
+# Python dependencies to Debian dependencies, websocket-client is not
included.
+websocket-client==0.12.0
  -r requirements.pip

[Francesco Banconi (frankban)]

Self review: trivial.

https://codereview.appspot.com/105820045/

[Francesco Banconi (frankban)]

*** Submitted:

Move websocket-client to test-requirements.pip.

R=
CC=
https://codereview.appspot.com/105820045

https://codereview.appspot.com/105820045/

=== modified file 'requirements.pip'
--- requirements.pip	2014-05-23 14:00:41 +0000
+++ requirements.pip	2014-06-06 08:48:58 +0000
@@ -21,11 +21,6 @@
 # formatted dependencies. Do not include other pip specific requirement
 # specifications (e.g. -e ... or -r ...).
 
-# XXX: BradCrittenden 2014-05-23: jujuclient 0.17.5 does not specify the
-# 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-client==0.12.0
 jujuclient==0.17.5
 PyYAML==3.10
 urwid==1.1.1

=== modified file 'test-requirements.pip'
--- test-requirements.pip	2014-03-12 10:10:21 +0000
+++ test-requirements.pip	2014-06-06 08:48:58 +0000
@@ -20,4 +20,11 @@
 flake8==2.1.0
 mock==1.0.1
 nose==1.3.1
+# XXX: BradCrittenden 2014-05-23: jujuclient 0.17.5 does not specify the
+# version of websocket-client to use.  Remove websocket-client as a dependency
+# here when moving to a newer jujuclient that correctly specifies the
+# version.
+# This is listed as a testing requirement so that, when dh_python2 translates
+# Python dependencies to Debian dependencies, websocket-client is not included.
+websocket-client==0.12.0
 -r requirements.pip