From 25ccfcc893e3096bfd292add0f855976365428b1 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Mon, 6 Apr 2015 16:52:02 +0300 Subject: [PATCH] Patch requirements.txt to support netaddr 0.7.14 MOS mirrors contain newer version of netaddr than specified in requirements.txt (0.7.14). So update for requirements.txt patch is required to support it LP #1439079 Change-Id: I2b9d0b863713bae2d466d4b92eecb980640a7c06 --- trusty/debian/changelog | 7 +++++++ ...irements.txt-adjust-for-Ubuntu-14.04.patch | 21 ++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 2ef7510a9..c085160cd 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,10 @@ +neutron (1:2014.2.2-fuel6.1-14.04-3) trusty; urgency=medium + + * Fixed patch for requirements.txt, removed upper bound for netaddr + because MOS mirros contains newer version (netaddr 0.7.14) + + -- Sergey Kolekonov Mon, 06 Apr 2015 16:47:51 +0300 + neutron (1:2014.2.2-fuel6.1-14.04-2) trusty; urgency=medium * Updated specs according to upstream version 2014.2.2 [1] 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 c311d324f..7c54222c3 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,17 +1,19 @@ -From 17d6fcd1fd93931e981d7261abe316b84a8237b2 Mon Sep 17 00:00:00 2001 +From 4f36a99bd8215246761bd7d9261614fbf70a7cb4 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov -Date: Wed, 11 Mar 2015 13:28:59 +0300 +Date: Mon, 6 Apr 2015 16:28:52 +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 +* Remove upper bound for netaddr, because MOS mirrors contains newer version + (0.7.14) --- - requirements.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + requirements.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt -index d597cdc..8e8dfa6 100644 +index d597cdc..d78a269 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,9 +5,8 @@ pbr>=0.6,!=0.7,<1.0 @@ -25,6 +27,15 @@ index d597cdc..8e8dfa6 100644 Babel>=1.3,<=1.3 eventlet>=0.15.1,<=0.15.2 greenlet>=0.3.2,<=0.4.2 +@@ -17,7 +16,7 @@ iso8601>=0.1.9,<=0.1.10 + jsonrpclib<=0.1.3 + Jinja2<=2.7.2 + keystonemiddleware>=1.0.0,<1.4.0 +-netaddr>=0.7.12,<=0.7.13 ++netaddr>=0.7.12 + python-neutronclient>=2.3.6,<3 + SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6 + WebOb>=1.2.3,<=1.3.1 -- 1.9.1 -- 2.45.2