From 54c2ba6a6661f3214775d91c5755c37c685574a4 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Wed, 12 Aug 2015 11:29:24 +0300 Subject: [PATCH] Update specs for the latest stable/kilo sources - Update the patch for requirements.txt according to the latest Kilo sources - Updated dependencies and changelog Related-bug: #1453148 Change-Id: I63dbfb794f6bc09867224d203d17ff39c935935c --- trusty/debian/changelog | 7 +++++++ trusty/debian/control | 8 ++++---- ...-requirements.txt-adjust-for-Ubuntu-14.04.patch | 14 +++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index b29f46192..fe930f4d9 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,10 @@ +neutron (1:2015.1.1-1~u14.04+mos1) mos7.0; urgency=medium + + * Update the patch for requirements.txt according to the latest Kilo sources + - Related-bug: #1453148 + + -- Sergey Kolekonov Wed, 12 Aug 2015 11:28:44 +0300 + neutron (1:2015.1.0-1~u14.04+mos7) mos7.0; urgency=medium * Add pyroute2 to dependencies for neutron-common as it's required to operate diff --git a/trusty/debian/control b/trusty/debian/control index 41d75bbe4..0bb3599c5 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -21,12 +21,12 @@ Build-Depends-Indep: python-httplib2 (>= 0.7.5), python-jinja2 (>= 2.6), python-jsonrpclib, - python-keystoneclient (>= 1:1.1.0), + python-keystoneclient (>= 1:1.2.0), python-keystonemiddleware (>= 1.5.0), python-mock (>= 1.0), python-mysqldb, python-netaddr (>= 0.7.12), - python-neutronclient (>= 1:2.3.11), + python-neutronclient (>= 1:2.4.0), python-novaclient (>= 1:2.22.0), python-oslo.concurrency (>= 1.8.0), python-oslo.config (>= 1:1.9.3), @@ -405,10 +405,10 @@ Depends: python-iso8601 (>= 0.1.9), python-jinja2 (>= 2.6), python-jsonrpclib, - python-keystoneclient (>= 1:1.1.0), + python-keystoneclient (>= 1:1.2.0), python-keystonemiddleware (>= 1.5.0), python-netaddr (>= 0.7.12), - python-neutronclient (>= 1:2.3.11), + python-neutronclient (>= 1:2.4.0), python-novaclient (>= 1:2.22.0), python-oslo.concurrency (>= 1.8.0), python-oslo.config (>= 1:1.9.3), 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 index 25348652d..f4a2393c6 100644 --- 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 @@ -1,25 +1,25 @@ -From 660d40f27d8cb3f0e43975ee652a917d8180c6ad Mon Sep 17 00:00:00 2001 +From 5bd791562e9b125b756742c8d469b73321d66331 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov -Date: Sat, 25 Apr 2015 21:35:49 +0300 +Date: Wed, 12 Aug 2015 11:25:32 +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 + routes 2.0 works just fine with python 2.7 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt -index 388120f..c264bbc 100644 +index a1956c0..4e4395e 100644 --- a/requirements.txt +++ b/requirements.txt -@@ -5,7 +5,7 @@ pbr>=0.6,!=0.7,<1.0 +@@ -5,7 +5,7 @@ pbr!=0.7,<1.0,>=0.6 Paste PasteDeploy>=1.5.0 --Routes>=1.12.3,!=2.0 +-Routes!=2.0,>=1.12.3 +Routes>=1.12.3 - eventlet>=0.16.1,!=0.17.0 + eventlet!=0.17.0,>=0.16.1 greenlet>=0.3.2 httplib2>=0.7.5 -- -- 2.32.3