From: Thomas Goirand Date: Mon, 2 Dec 2013 14:59:41 +0000 (+0800) Subject: Fixes the sqlalchemy requirements.txt that restricted to SQLAlchemy <= 0.7.99. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0398d57564e7f0d11c60d9c892a9dd8b95e3ee30;p=openstack-build%2Fneutron-build.git Fixes the sqlalchemy requirements.txt that restricted to SQLAlchemy <= 0.7.99. Change-Id: Ic45f467fd3003a8f2b699eb215b3b2f259bec01e --- diff --git a/debian/changelog b/debian/changelog index e151f6c24..981f4f479 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ neutron (2013.2-7) UNRELEASED; urgency=low * neutron-l3-agent & neutron-vpn-agent now conflicts with each other. * Fixed the cron.d files for lbass, dhcp and l3, so that they are on a single line instead of broken lines with \ (this doesn't work otherwise). + * Fixes the sqlalchemy requirements.txt that restricted to SQLAlchemy + <= 0.7.99. -- Thomas Goirand Mon, 02 Dec 2013 22:39:46 +0800 diff --git a/debian/patches/fixes-SQLAlchemy-requirement.patch b/debian/patches/fixes-SQLAlchemy-requirement.patch new file mode 100644 index 000000000..e4f4e3cb8 --- /dev/null +++ b/debian/patches/fixes-SQLAlchemy-requirement.patch @@ -0,0 +1,18 @@ +Description: Fixes the sqlalchemy requirement + Upstream wrongly restricts SQLAlchemy dependency, while 0.8 is perfectly + fine with Neutron. +Author: Thomas Goirand +Forwarded: no +Last-Update: 2013-12-02 + +--- neutron-2013.2.orig/requirements.txt ++++ neutron-2013.2/requirements.txt +@@ -17,7 +17,7 @@ Jinja2 + kombu>=2.4.8 + netaddr + python-neutronclient>=2.3.0,<3 +-SQLAlchemy>=0.7.8,<=0.7.99 ++SQLAlchemy>=0.7.8 + WebOb>=1.2.3,<1.3 + python-keystoneclient>=0.3.2 + alembic>=0.4.1 diff --git a/debian/patches/series b/debian/patches/series index 25b97dfe6..218bbf4f9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ fix-alembic-migration-with-sqlite3.patch better-config-default.patch +fixes-SQLAlchemy-requirement.patch