Merge lp:~james-page/glance/sqlalchemy-bump into lp:~ubuntu-server-dev/glance/havana

[James Page]

Fixup sqlalchemy support -current broken in saucy

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-19 15:05:30 +0000
+++ debian/changelog	2013-07-24 07:33:24 +0000
@@ -1,3 +1,10 @@
+glance (1:2013.2~b2-0ubuntu2) saucy; urgency=low
+
+  * d/p/bump-sqlalchemy-versions.patch: Include 0.8.x of SQLAlchemy as
+    a supported version.
+
+ -- James Page <[e-mail]>  Wed, 24 Jul 2013 08:26:23 +0100
+
 glance (1:2013.2~b2-0ubuntu1) saucy; urgency=low
 
   [ Yolanda Robla ]

=== added file 'debian/patches/bump-sqlalchemy-versions.patch'
--- debian/patches/bump-sqlalchemy-versions.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/bump-sqlalchemy-versions.patch	2013-07-24 07:33:24 +0000
@@ -0,0 +1,18 @@
+Description: Bump SQLAlchemy requirements to include 0.8.x
+ Fixup requirements to include sqlalchemy 0.8.x until
+ upstream catchup.
+Author: James Page <[e-mail]>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tools/pip-requires
++++ b/tools/pip-requires
+@@ -4,7 +4,7 @@
+ greenlet>=0.3.1
+ 
+ # < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
+-SQLAlchemy>=0.7.8,<=0.7.99
++SQLAlchemy>=0.7.8,<=0.8.99
+ anyjson>=0.3.3
+ eventlet>=0.9.12
+ PasteDeploy

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-19 15:05:19 +0000
+++ debian/patches/series	2013-07-24 07:33:24 +0000
@@ -1,2 +1,3 @@
 sql_conn.patch
 disable-network-for-docs.patch
+bump-sqlalchemy-versions.patch