Merge lp:~zulcss/nova/house-cleaning into lp:~ubuntu-server-dev/nova/havana

[Chuck Short]

Fall cleaning of dependencies.

[Adam Gandelman (gandelman-a)]

Looks good for the most part, but we're still stripping the version requirement of python-six via the patch. Could we not just describe the python-six version req in d/control and remove that bit from the patch?

review: Needs Fixing

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-13 14:27:08 +0000
+++ debian/changelog	2013-09-19 17:10:10 +0000
@@ -1,6 +1,20 @@
 nova (1:2013.2~b3-0ubuntu2) saucy; urgency=low
 
   * debian/tests: Removed tests for nova-compute-xen and nova-compute-xcp.
+  * debian/control: 
+    - Dropped python-setuptools-git, python-carrot, python-unittest2, python-daemon, 
+      python-gflags, python-cheetah, python-glance, python-lockfile, python-routes,
+      python-xattr, python-novaclient, python-pycurl, python-keystone, python-libxml2,
+      python-pyparsing.
+    - Suggest python-ldap for python-nova.
+    - Added python-mock, python-greenlet, python-keystoneclient, python-anyjson,
+      python-jsonschema, python-six
+    - Bumped versioned dependencies for python-fixtures, python-testtools, and testrepository,
+      python-stevedore,
+    - Added versioned depends for python-cinderclient, python-neutronclient, python-boto,
+      python-paramiko, python-amplib, python-eventlet, python-glanceclient, python-oslo.config,
+      python-paramiko, 
+  * debian/patches/fix-requirements.patch: Rediffed
  
 
  -- Chuck Short <[e-mail]>  Fri, 13 Sep 2013 10:12:52 -0400

=== modified file 'debian/control'
--- debian/control	2013-09-09 13:42:02 +0000
+++ debian/control	2013-09-19 17:10:10 +0000
@@ -9,48 +9,49 @@
  python-all-dev (>= 2.6.6-3~)
 Build-Depends-Indep: openssh-client,
  openssl,
- python-amqplib,
+ python-amqplib (>= 0.6.1),
+ python-anyjson (>= 0.3.3),
  python-babel,
- python-boto,
- python-carrot,
- python-cinderclient,
+ python-boto (>= 2.4.0),
+ python-cinderclient (>= 1:1.0.5),
  python-coverage,
  python-crypto,
  python-d2to1 (>= 0.2.10),
  python-distutils-extra,
- python-eventlet,
- python-fixtures (>= 0.3.12),
+ python-eventlet (>= 0.13.0),
+ python-fixtures (>= 0.3.14),
  python-feedparser,
- python-glanceclient,
+ python-greenlet (>= 0.3.2),
+ python-glanceclient (>= 1:0.9.0),
  python-iso8601,
+ python-keystoneclient (>= 1:0.3.2)
  python-kombu (>= 2.5.12),
+ python-jsonschema (>= 1.3.0)
  python-jinja2,
- python-lxml,
+ python-lxml (>= 2.3),
  python-migrate,
+ python-mock,
  python-mox,
  python-netaddr (>= 0.7.6),
- python-novaclient (>= 1:2.9.0),
- python-oslo.config,
+ python-oslo.config (>= 1.2.0a3),
  python-oslo.sphinx,
- python-paramiko,
+ python-paramiko (>= 1.8.0),
  python-paste,
  python-pastedeploy (>= 1.5.0),
  python-pbr (>= 0.5.11),
  python-pyasn1,
- python-pyparsing (>= 1.5.6),
- python-neutronclient,
+ python-neutronclient (>= 1:2.3.0),
  python-routes,
  python-setuptools,
- python-setuptools-git,
- python-stevedore (>= 0.7.2),
+ python-six,
+ python-stevedore (>= 0.10.0),
  python-sphinx (>> 1.0),
  python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy,
  python-suds,
- python-testtools (>= 0.9.22),
- python-unittest2,
+ python-testtools (>= 0.9.32),
  python-webob (>= 1.2.3),
  sqlite3,
- testrepository ( >= 0.0.8)
+ testrepository ( >= 0.0.17)
 Build-Conflicts: python-cjson
 Standards-Version: 3.9.3
 Homepage: http://launchpad.net/nova
@@ -63,44 +64,40 @@
 Section: python
 Depends: openssh-client,
  openssl,
+ python-amplib (>= 0.6.1),
+ python-anyjson (>= 0.3.3),
  python-babel,
- python-boto,
- python-carrot,
- python-cheetah,
- python-cinderclient,
- python-daemon,
- python-eventlet,
- python-feedparser,
- python-gflags,
- python-glance,
- python-glanceclient,
+ python-boto (>= 2.4.0),
+ python-cinderclient (>= 1:1.0.5),
+ python-eventlet (>= 0.13.0),
+ python-greenlet (>= 0.3.2),
+ python-glanceclient (>= 1:0.9.0),
+ python-keystoneclient (>= 1:0.3.2),
+ python-neutronclient (>= 1:2.3.0),
  python-iso8601,
- python-keystone,
+ python-jinja2,
+ python-jsonschema (>= 1.3.0),
  python-kombu (>= 2.5.12),
- python-ldap,
- python-libxml2,
- python-lockfile,
- python-lxml,
+ python-lxml (>= 2.3),
  python-m2crypto,
  python-migrate,
  python-netaddr (>= 0.7.6),
- python-novaclient (>= 1:2.9.0),
+ python-oslo.config (>= 1.2.0a3),
+ python-paramiko (>= 1.8.0),
  python-paste,
- python-pastedeploy,
- python-pyparsing (>= 1.5.6),
- python-pycurl,
+ python-pastedeploy (>= 1.5.0),
  python-routes,
+ python-six,
  python-simplejson,
  python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy (<< 0.6.3-2),
+ python-stevedore (>= 0.10),
  python-pyasn1,
  python-suds,
- python-tempita,
  python-webob (>= 1.2.3),
- python-xattr,
  sudo,
  ${misc:Depends},
  ${python:Depends}
-Suggests: python-suds (>= 0.4.0)
+Suggests: python-ldap
 Conflicts: python-cjson
 XB-Python-Version: ${python:Versions}
 Recommends: python-mysqldb

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2013-09-13 14:28:05 +0000
+++ debian/patches/fix-requirements.patch	2013-09-19 17:10:10 +0000
@@ -1,5 +1,5 @@
 diff --git a/requirements.txt b/requirements.txt
-index 341a41e..610b576 100644
+index 64a65f5..f6638ab 100644
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -1,5 +1,5 @@
@@ -9,11 +9,15 @@
  amqplib>=0.6.1
  anyjson>=0.3.3
  argparse
-@@ -27,7 +27,6 @@ python-glanceclient>=0.9.0
+@@ -25,9 +25,8 @@ python-cinderclient>=1.0.5
+ python-neutronclient>=2.3.0,<3
+ python-glanceclient>=0.9.0
  python-keystoneclient>=0.3.2
- six<1.4.0
+-six<1.4.0
++six
  stevedore>=0.10
 -websockify>=0.5.1,<0.6
  
  -f http://tarballs.openstack.org/oslo.config/oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3
  oslo.config>=1.2.0a3
+