Refreshed SQLA version fix in requirements.txt

Change-Id: I2751ef3e0f32608e77b1dfb788e0536f5820866b

Rewritten-From: 5b8cdc4ff8d9f8d43a5e9ac26b5082dfce199b93

diff --git a/trusty/debian/patches/removes-sqla0.8-restrictions.patch b/trusty/debian/patches/removes-sqla0.8-restrictions.patch
new file mode 100644 (file)
index 0000000..cd4c50b
--- /dev/null
+++ b/trusty/debian/patches/removes-sqla0.8-restrictions.patch
@@ -0,0 +1,16 @@
+Description: Fixes SQLA 0.8 restriction to allow higher versions
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: not-needed
+Last-Update: 2014-03-14
+
+--- ceilometer-2014.1~b3.orig/requirements.txt
++++ ceilometer-2014.1~b3/requirements.txt
+@@ -26,7 +26,7 @@ pytz>=2010h
+ PyYAML>=3.1.0
+ requests>=1.1
+ six>=1.5.2
+-SQLAlchemy>=0.7.8,<=0.8.99
++SQLAlchemy>=0.7.8
+ sqlalchemy-migrate>=0.8.2
+ stevedore>=0.14
+ WebOb>=1.2.3

diff --git a/trusty/debian/patches/removes-sqlalchemy-restriction.patch b/trusty/debian/patches/removes-sqlalchemy-restriction.patch
deleted file mode 100644 (file)
index d2a1823..0000000
--- a/trusty/debian/patches/removes-sqlalchemy-restriction.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Removes SQLAlchemy restriction
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: not-needed
-Last-Update: 2013-12-09
-
---- ceilometer-2014.1~b1.orig/requirements.txt
-+++ ceilometer-2014.1~b1/requirements.txt
-@@ -23,7 +23,7 @@ python-swiftclient>=1.5
- PyYAML>=3.1.0
- requests>=1.1
- six>=1.4.1
--SQLAlchemy>=0.7.8,<=0.7.99
-+SQLAlchemy>=0.7.8
- sqlalchemy-migrate>=0.8.2
- stevedore>=0.12
- WebOb>=1.2.3,<1.3

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 31b8fb8193ce160eb2e74e71ab1cc813f4ed3dbb..970683ff9a422ddce3d54440b4b43a75a48ac94f 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1 +1 @@
-removes-sqlalchemy-restriction.patch
+removes-sqla0.8-restrictions.patch