From 566b3c39139b9d258b4f49bf5e4a24ce4ba1b08a Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 8 Mar 2014 15:34:21 +0800 Subject: [PATCH] Fixed requirements patches. Rewritten-From: f9d859b81e8507b414344ba642f3f81a4102ffa0 --- .../patches/fix-sqlalchemy-requirements.txt | 22 +++++++++---------- .../debian/patches/fix-webob-requirements.txt | 17 -------------- xenial/debian/patches/series | 1 - 3 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 xenial/debian/patches/fix-webob-requirements.txt diff --git a/xenial/debian/patches/fix-sqlalchemy-requirements.txt b/xenial/debian/patches/fix-sqlalchemy-requirements.txt index 3ccebe606..23cdb2c13 100644 --- a/xenial/debian/patches/fix-sqlalchemy-requirements.txt +++ b/xenial/debian/patches/fix-sqlalchemy-requirements.txt @@ -1,18 +1,16 @@ -Description: Fixes wrong sqlalchemy requirements +Description: Allow SQLAlchemy 0.9.x Author: Thomas Goirand Forwarded: no -Last-Update: 2013-12-19 +Last-Update: 2014-03-08 -Index: cinder/requirements.txt -=================================================================== ---- cinder.orig/requirements.txt 2014-01-24 14:46:56.000000000 +0800 -+++ cinder/requirements.txt 2014-01-24 16:25:31.000000000 +0800 -@@ -22,7 +22,7 @@ - taskflow>=0.1.1,<0.2 +--- cinder-2014.1~b3.orig/requirements.txt ++++ cinder-2014.1~b3/requirements.txt +@@ -22,7 +22,7 @@ Routes>=1.12.3 + taskflow>=0.1.3,<0.2 rtslib-fb>=2.1.39 - six>=1.4.1 --SQLAlchemy>=0.7.8,<=0.7.99 + six>=1.5.2 +-SQLAlchemy>=0.7.8,<=0.8.99 +SQLAlchemy>=0.7.8 - sqlalchemy-migrate>=0.8.2 - stevedore>=0.12 + sqlalchemy-migrate>=0.8.2,!=0.8.4 + stevedore>=0.14 suds>=0.4 diff --git a/xenial/debian/patches/fix-webob-requirements.txt b/xenial/debian/patches/fix-webob-requirements.txt deleted file mode 100644 index eb4c79008..000000000 --- a/xenial/debian/patches/fix-webob-requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix webob requirements.txt - This avoid loads of unit tests errors. -Author: Thomas Goirand -Forwarded: no -Last-Update: 2014-02-03 - -Index: cinder/requirements.txt -=================================================================== ---- cinder.orig/requirements.txt 2014-02-17 15:13:26.000000000 +0800 -+++ cinder/requirements.txt 2014-02-17 15:13:49.000000000 +0800 -@@ -26,5 +26,5 @@ - sqlalchemy-migrate>=0.8.2 - stevedore>=0.12 - suds>=0.4 --WebOb>=1.2.3,<1.3 -+WebOb>=1.2.3 - wsgiref>=0.1.2 diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series index 8a61f8a6d..0fe267def 100644 --- a/xenial/debian/patches/series +++ b/xenial/debian/patches/series @@ -1,3 +1,2 @@ install-missing-files.patch fix-sqlalchemy-requirements.txt -fix-webob-requirements.txt -- 2.45.2