* Refreshed routes 2.0 in requirements patch.

  * Deleted debian/patches/Fix_DummyResource_missing_in_provider_error.patch
    applied upstream.

Rewritten-From: f4f7caa28f7b75848fc4e920ba8517ee5ec996aa

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index c72d64bb68180a7dfe6001e2b8606ac368045654..23a934695436ca2c9abd8f104954d518f9acc6cb 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -2,6 +2,9 @@ heat (1:5.0.0~b3-1) experimental; urgency=medium
 
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * Refreshed routes 2.0 in requirements patch.
+  * Deleted debian/patches/Fix_DummyResource_missing_in_provider_error.patch
+    applied upstream.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 07 Sep 2015 12:40:05 +0200
 

diff --git a/trusty/debian/patches/Fix_DummyResource_missing_in_provider_error.patch b/trusty/debian/patches/Fix_DummyResource_missing_in_provider_error.patch
deleted file mode 100644 (file)
index c9eb784..0000000
--- a/trusty/debian/patches/Fix_DummyResource_missing_in_provider_error.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Fix `DummyResource missing in provider` error
-Author: Rabi Mishra <ramishra@redhat.com>
-Date: Wed, 29 Jul 2015 03:33:19 +0000 (+0530)
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fheat.git;a=commitdiff_plain;h=c6c1cc9e8ad68c431debfa92cdf2d2b9aca53804
-Change-Id: Ie1144702b9a6c008889116b408b4b09c3087d73e
-Bug-Ubuntu: https://bugs.launchpad.net/heat/+bug/1479185
-Origin: upstream, https://review.openstack.org/#/c/206862/
-Last-Update: 2015-08-03
-
-diff --git a/heat/tests/test_provider_template.py b/heat/tests/test_provider_template.py
-index f883c0b..1394750 100644
---- a/heat/tests/test_provider_template.py
-+++ b/heat/tests/test_provider_template.py
-@@ -279,12 +279,19 @@ class ProviderTemplateTest(common.HeatTestCase):
-         provider = {
-             'HeatTemplateFormatVersion': '2012-12-12',
-             'Outputs': {
--                'Blarg': {'Value': 'wibble'},
-+                'Foo': {'Value': 'bar'},
-             },
-         }
-         files = {'test_resource.template': json.dumps(provider)}
- 
-+        class DummyResource(object):
-+            support_status = support.SupportStatus()
-+            properties_schema = {}
-+            attributes_schema = {"Foo": attributes.Schema(
-+                "A test attribute")}
-+
-         env = environment.Environment()
-+        resource._register_class('DummyResource', DummyResource)
-         env.load({'resource_registry':
-                   {'DummyResource': 'test_resource.template'}})
-         stack = parser.Stack(utils.dummy_context(), 'test_stack',
-@@ -298,12 +305,12 @@ class ProviderTemplateTest(common.HeatTestCase):
-                                                       definition, stack)
-         self.assertIsNone(temp_res.validate())
-         nested = mock.Mock()
--        nested.outputs = {'Blarg': {'Value': 'not-this',
--                                    'error_msg': 'it is all bad'}}
-+        nested.outputs = {'Foo': {'Value': 'not-this',
-+                                  'error_msg': 'it is all bad'}}
-         nested.output.return_value = None
-         temp_res._nested = nested
-         self.assertRaises(exception.InvalidTemplateAttribute,
--                          temp_res.FnGetAtt, 'Blarg')
-+                          temp_res.FnGetAtt, 'Foo')
- 
-     def test_properties_normal(self):
-         provider = {

diff --git a/trusty/debian/patches/allow-route-2.0.patch b/trusty/debian/patches/allow-route-2.0.patch
index 3838e760c818ca922312b0aeb7e81ff59c1cc182..c2b82485c42442dd675967ff14a541b63273e167 100644 (file)
--- a/trusty/debian/patches/allow-route-2.0.patch
+++ b/trusty/debian/patches/allow-route-2.0.patch
@@ -5,15 +5,17 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: not-needed
 Last-Update: 2015-08-02
 
---- 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
+Index: heat/requirements.txt
+===================================================================
+--- heat.orig/requirements.txt
++++ heat/requirements.txt
+@@ -51,8 +51,7 @@ python-zaqarclient>=0.1.1
+ pytz>=2013.6
  PyYAML>=3.1.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<1.1.0,>=0.9.7
+ SQLAlchemy<1.1.0,>=0.9.9
  sqlalchemy-migrate>=0.9.6

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index b5c9cb1449918699ef056b56fdf7619def2d3895..b8ea60012f42277f641ff8ae4d8b0769f30859f7 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,3 +1,2 @@
 only-run-tests-in-heat.tests.patch
 allow-route-2.0.patch
-Fix_DummyResource_missing_in_provider_error.patch