Rebased and updated patches.

Rewritten-From: a6cc1426ffbfb6a9345caf8692e9b915cff9429d

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 1b209c69ce3305e425c04cfce50b4ea0b820b2a8..c3d8fc1c0c40f3deff9a3bdccb95b2282fd4dca8 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -2,6 +2,7 @@ heat (1:5.0.0~b2-1) experimental; urgency=medium
 
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * Rebased and updated patches.
 
  -- Thomas Goirand <zigo@debian.org>  Sun, 02 Aug 2015 11:22:32 +0200
 

diff --git a/xenial/debian/patches/allow-route-2.0.patch b/xenial/debian/patches/allow-route-2.0.patch
index 380a6f261cc9a49e2bed9ef6ca4b23820998284f..3838e760c818ca922312b0aeb7e81ff59c1cc182 100644 (file)
--- a/xenial/debian/patches/allow-route-2.0.patch
+++ b/xenial/debian/patches/allow-route-2.0.patch
@@ -1,21 +1,19 @@
-Description: Allow routes 2.0
- Upstream is rejecting Routes 2.0 because the archive on PyPi is broken,
- however, the Debian package for Routes 2.0 is perfectly fine. So we remove
- the restriction.
+Description: Allow Routes == 2.0
+ The Debian package for Routes 2.0 is perfectly valid, as it contains patches.
+ This patch makes it possible to use it.
 Author: Thomas Goirand <zigo@debian.org>
 Forwarded: not-needed
-Last-Update: 2015-03-19
+Last-Update: 2015-08-02
 
-Index: heat/requirements.txt
-===================================================================
---- heat.orig/requirements.txt
-+++ heat/requirements.txt
-@@ -40,7 +40,7 @@ python-troveclient>=1.0.7
+--- heat-5.0.0~b2.orig/requirements.txt
++++ heat-5.0.0~b2/requirements.txt
+@@ -49,8 +49,7 @@ python-troveclient>=1.0.9
+ python-zaqarclient>=0.1.1
  PyYAML>=3.1.0
- qpid-python
- requests>=2.2.0,!=2.4.0
--Routes>=1.12.3,!=2.0
+ requests>=2.5.2
+-Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
+-Routes!=2.0,>=1.12.3;python_version!='2.7'
 +Routes>=1.12.3
  six>=1.9.0
- SQLAlchemy>=0.9.7,<=0.9.99
- sqlalchemy-migrate>=0.9.5
+ SQLAlchemy<1.1.0,>=0.9.7
+ sqlalchemy-migrate>=0.9.6

diff --git a/xenial/debian/patches/fix-sqlalchemy-requirements.txt b/xenial/debian/patches/fix-sqlalchemy-requirements.txt
deleted file mode 100644 (file)
index ab40222..0000000
--- a/xenial/debian/patches/fix-sqlalchemy-requirements.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-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 2e0bc3d3441c9a0a519330d8de673e4100130173..7ebb60f8272ae07f6e8d348082b3b5efa73fca4e 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1,4 +1,3 @@
-allow-route-2.0.patch
 only-run-tests-in-heat.tests.patch
 using-assertRegexp-instead-of-Regex.patch
-fix-sqlalchemy-requirements.txt
+allow-route-2.0.patch

diff --git a/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch b/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch
index 65c4c8793b6797f7dacc80ab4426605219908f83..d4d91c78ea5b821339bbca2805534012ba80fd05 100644 (file)
--- a/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch
+++ b/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch
@@ -10,12 +10,12 @@ 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
+@@ -1005,7 +1005,7 @@ class SoftwareDeploymentTest(common.Heat
              '^http://192.0.2.1/v1/AUTH_test_tenant_id/'
-             '(software_deployment_test_stack-deployment_mysql-.*)/(.*)'
+             '(.*)/(software_deployment_test_stack-deployment_mysql-.*)'
              '\\?temp_url_sig=.*&temp_url_expires=\\d*$')
 -        self.assertRegex(temp_url, temp_url_pattern)
 +        self.assertRegexp(temp_url, temp_url_pattern)
          m = temp_url_pattern.search(temp_url)
-         object_name = m.group(2)
-         self.assertEqual(container, m.group(1))
+         container = m.group(1)
+         self.assertEqual(object_name, m.group(2))