* Refreshed patch.

  * Added sqlalchemy version patch in requirements.txt.

Rewritten-From: ac4dea80d9b11a89c272c1c21d5fe01beb5cf8bf

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 9dbaee4c952e0cbf27a64c8bb24740733225b652..753e22b60d289bd704b9d1383fdb5cdfd3a18ce6 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,6 +1,8 @@
 heat (2015.1.0-4) unstable; urgency=medium
 
   * Rebuilt with sqlalchemy 1.0.6.
+  * Refreshed patch.
+  * Added sqlalchemy version patch in requirements.txt.
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 01 Jul 2015 02:27:14 +0000
 

diff --git a/xenial/debian/patches/fix-sqlalchemy-requirements.txt b/xenial/debian/patches/fix-sqlalchemy-requirements.txt
new file mode 100644 (file)
index 0000000..ab40222
--- /dev/null
+++ b/xenial/debian/patches/fix-sqlalchemy-requirements.txt
@@ -0,0 +1,16 @@
+Description: Fix too restrictive sqlalchemy restriction in requirements.txt
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2015-07-01
+
+--- heat-2015.1.0.orig/requirements.txt
++++ heat-2015.1.0/requirements.txt
+@@ -42,7 +42,7 @@ qpid-python
+ requests>=2.2.0,!=2.4.0
+ Routes>=1.12.3
+ six>=1.9.0
+-SQLAlchemy>=0.9.7,<=0.9.99
++SQLAlchemy>=0.9.7
+ sqlalchemy-migrate>=0.9.5
+ stevedore>=1.3.0,<1.4.0  # Apache-2.0
+ WebOb>=1.2.3

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 8055e2e581d74f7bedba8118dea2668b3bd3aa5b..2e0bc3d3441c9a0a519330d8de673e4100130173 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1,3 +1,4 @@
 allow-route-2.0.patch
 only-run-tests-in-heat.tests.patch
 using-assertRegexp-instead-of-Regex.patch
+fix-sqlalchemy-requirements.txt

diff --git a/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch b/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch
index 10000428f814ecba04a54920580dbf050a12d53f..65c4c8793b6797f7dacc80ab4426605219908f83 100644 (file)
--- a/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch
+++ b/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch
@@ -6,9 +6,11 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: not-needed
 Last-Update: 2015-04-16
 
---- heat-2015.1~rc1.orig/heat/tests/test_software_deployment.py
-+++ heat-2015.1~rc1/heat/tests/test_software_deployment.py
-@@ -951,7 +951,7 @@ class SoftwareDeploymentTest(common.Heat
+Index: heat/heat/tests/test_software_deployment.py
+===================================================================
+--- heat.orig/heat/tests/test_software_deployment.py
++++ heat/heat/tests/test_software_deployment.py
+@@ -952,7 +952,7 @@ class SoftwareDeploymentTest(common.Heat
              '^http://192.0.2.1/v1/AUTH_test_tenant_id/'
              '(software_deployment_test_stack-deployment_mysql-.*)/(.*)'
              '\\?temp_url_sig=.*&temp_url_expires=\\d*$')