From: Sergey Kolekonov <skolekonov@mirantis.com>
Date: Wed, 25 Feb 2015 19:41:08 +0000 (+0300)
Subject: Fix requirements for Neutron Trusty packages
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e428985b666689b20b4bcf3830619e179d18b8d9;p=openstack-build%2Fneutron-build.git

Fix requirements for Neutron Trusty packages

- removed unnecessary requirements (argparse, Routes!=2.0)
- corrected packages dependencies

Change-Id: Ib7d2d31647373c528250a99f02914ced9f2b265a
---

diff --git a/trusty/debian/control b/trusty/debian/control
index 1b0774073..07dc0ae6e 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -2,7 +2,7 @@ Source: neutron
 Section: net
 Priority: optional
 Maintainer: MOS Neutron Team <mos-neutron@mirantis.com>
-Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
+Build-Depends: debhelper (>= 9), python-all (>= 2.7)
 Build-Depends-Indep:
  alembic (>= 0.6.4),
  python-anyjson (>= 0.3.3),
@@ -29,7 +29,7 @@ Build-Depends-Indep:
  python-oslo.rootwrap (>= 1.3.0),
  python-paste,
  python-pastedeploy,
- python-pbr (>= 0.6),
+ python-pbr (>= 0.10),
  python-requests (>= 1.2.1),
  python-requests-mock,
  python-routes (>= 1.12.3),
@@ -43,7 +43,7 @@ Build-Depends-Indep:
  python-webtest (>= 2.0),
  subunit,
  testrepository ( >= 0.0.18)
-XS-Python-Version: >= 2.6
+XS-Python-Version: >= 2.7
 Standards-Version: 3.9.4
 XS-Testsuite: autopkgtest
 
@@ -443,7 +443,7 @@ Depends:
  python-requests (>= 1.2.1),
  python-routes (>= 1.12.3),
  python-six (>= 1.7.0),
- python-sqlalchemy (>= 0.8.4),
+ python-sqlalchemy (>= 0.9.7),
  python-stevedore (>= 1.0.0),
  python-webob (>= 1.2.3),
  ${misc:Depends},
diff --git a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
new file mode 100644
index 000000000..23e211fa8
--- /dev/null
+++ b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
@@ -0,0 +1,30 @@
+From 995801873f795b873fe396984d380bc00ce5110b Mon Sep 17 00:00:00 2001
+From: Sergey Kolekonov <skolekonov@mirantis.com>
+Date: Wed, 25 Feb 2015 22:32:35 +0300
+Subject: [PATCH] requirements.txt: adjust for Ubuntu 14.04
+
+* Routes!=2.0 restriction is necessary only for running tests with python 3.x,
+  routes 2.0 work just fine with python 2.7
+* argparse is not required as it's provided by python
+---
+ requirements.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index c330c6d..796531e 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -5,9 +5,8 @@ pbr>=0.6,!=0.7,<1.0
+ 
+ Paste
+ PasteDeploy>=1.5.0
+-Routes>=1.12.3,!=2.0
++Routes>=1.12.3
+ anyjson>=0.3.3
+-argparse
+ Babel>=1.3
+ eventlet>=0.15.1,<0.16.0
+ greenlet>=0.3.2
+-- 
+1.9.1
+
diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 767b46cbe..45130c8f7 100644
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,2 +1,3 @@
+0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
 fix-neutron-configuration.patch
 disable-udev-tests.patch