Merge lp:~corey.bryant/heat/2014.2-rc1 into lp:~ubuntu-server-dev/heat/juno

[Corey Bryant]

[lp:~corey.bryant/heat/2014.2-rc1]

73. By Corey Bryant on 2014-10-05

* New upstream release candidate:
  - d/watch: Change path.
  - d/control: Align requirements with rc1.
  - d/rules: Enable tests.
  - d/patch/fix-requirements.patch: Align requirements with Ubuntu.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-08 13:41:01 +0000
+++ debian/changelog	2014-10-05 02:14:58 +0000
@@ -1,3 +1,13 @@
+heat (2014.2~rc1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate:
+    - d/watch: Change path.
+    - d/control: Align requirements with rc1.
+    - d/rules: Enable tests.
+    - d/patch/fix-requirements.patch: Align requirements with Ubuntu.
+
+ -- Corey Bryant <[e-mail]>  Thu, 02 Oct 2014 05:59:15 -0400
+
 heat (2014.2~b3-0ubuntu1) utopic; urgency=medium
 
   * New upstream version. 

=== modified file 'debian/control'
--- debian/control	2014-07-25 14:08:16 +0000
+++ debian/control	2014-10-05 02:14:58 +0000
@@ -12,54 +12,64 @@
 Build-Depends:
  debhelper (>= 9),
  python-all (>= 2.6.6-3~),
- python-pbr (>= 0.5.21),
+ python-pbr (>= 0.6),
 Build-Depends-Indep:
- python-babel,
+ python-alembic,
+ python-babel (>= 1.3),
  python-boto (>= 2.4),
- python-ceilometerclient,
- python-cinderclient,
- python-coverage,
- python-crypto,
- python-eventlet (>= 0.12.0),
+ python-ceilometerclient (>= 1.0.6),
+ python-cinderclient (>= 1:1.0.7),
+ python-coverage (>= 3.6),
+ python-crypto (>= 2.6),
+ python-eventlet (>= 0.13.0),
  python-extras,
- python-glanceclient,
+ python-glanceclient (>= 1:0.14.0),
  python-greenlet (>= 0.3.2),
- python-heatclient,
- python-httplib2,
- python-iso8601,
- python-keystoneclient (>= 1:0.2.3),
- python-kombu,
+ python-hacking (>= 0.8.0),
+ python-heatclient (>= 0.2.9),
+ python-httplib2 (>= 0.7.5),
+ python-iso8601 (>= 0.1.9),
+ python-keystoneclient (>= 1:0.10.0),
+ python-keystonemiddleware (>= 1.0.0),
+ python-kombu (>=2.4.8),
  python-lockfile (>= 0.8),
  python-lxml (>= 2.3),
  python-memcache,
- python-migrate,
- python-mox,
- python-netaddr,
- python-neutronclient (>= 1:2.2.0),
- python-novaclient,
- python-oslo.config,
- python-oslo.messaging,
- python-oslosphinx,
- python-oslotest,
+ python-migrate (>= 0.9.1),
+ python-mock (>= 1.0),
+ python-mox (>= 0.5.3),
+ python-mysqldb,
+ python-netaddr (>= 0.7.12),
+ python-neutronclient (>= 1:2.3.6),
+ python-novaclient (>= 1:2.18.0),
+ python-oslo.config (>= 1:1.4.0),
+ python-oslo.db (>= 1.0.0),
+ python-oslo.i18n (>= 1.0.0),
+ python-oslo.messaging (>= 1.4.0),
+ python-oslo.utils (>= 1.0.0),
+ python-oslosphinx (>= 2.2.0),
+ python-oslotest (>= 1:1.1.0),
  python-posix-ipc,
  python-paramiko,
  python-paste,
- python-pastedeploy,
- python-requests,
- python-routes,
+ python-pastedeploy (>= 1.5.0),
+ python-psycopg2,
+ python-requests (>= 1.2.1),
+ python-routes (>= 1.12.3),
+ python-saharaclient (>= 0.7.3),
  python-setuptools,
- python-stevedore,
- python-six,
- python-sphinx,
- python-sqlalchemy (>= 0.7.8),
- python-swiftclient,
- python-testrepository (>= 0.0.13),
- python-testscenarios,
- python-testtools (>= 0.9.29),
- python-troveclient,
+ python-stevedore (>= 1.0.0),
+ python-six (>= 1.7.0),
+ python-sphinx (>= 1.1.2),
+ python-sqlalchemy (>= 0.8.4),
+ python-swiftclient (>= 2.2.0),
+ python-testrepository (>= 0.0.18),
+ python-testscenarios (>= 0.4),
+ python-testtools (>= 0.9.34),
+ python-troveclient (>= 1:1.0.4),
  python-webob (>= 1.2.3),
- python-yaml,
- testrepository (>= 0.0.13)
+ python-yaml (>= 3.1.0),
+ testrepository (>= 0.0.18),
 Standards-Version: 3.9.4
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/juno/files
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/heat/juno
@@ -70,34 +80,55 @@
 Section: python
 Architecture: all
 Depends:
- python-argparse,
+ python-alembic,
+ python-babel (>= 1.3),
  python-boto (>= 2.4),
- python-cinderclient,
- python-crypto,
- python-eventlet (>= 0.12.0),
+ python-ceilometerclient (>= 1.0.6),
+ python-cinderclient (>= 1:1.0.7),
+ python-coverage (>= 3.6),
+ python-crypto (>= 2.6),
+ python-eventlet (>= 0.13.0),
  python-extras,
- python-glanceclient,
+ python-glanceclient (>= 1:0.14.0),
  python-greenlet (>= 0.3.2),
- python-httplib2,
- python-iso8601,
- python-keystoneclient (>= 1:0.2.3),
- python-kombu,
+ python-httplib2 (>= 0.7.5),
+ python-iso8601 (>= 0.1.9),
+ python-hacking (>= 0.8.0),
+ python-heatclient (>= 0.2.9),
+ python-keystoneclient (>= 1:0.10.0),
+ python-keystonemiddleware (>= 1.0.0),
+ python-kombu (>=2.4.8),
+ python-lockfile (>= 0.8),
  python-lxml (>= 2.3),
  python-memcache,
- python-migrate,
+ python-migrate (>= 0.9.1),
  python-mysqldb,
- python-neutronclient (>= 1:2.2.0),
- python-novaclient,
- python-oslo.config,
+ python-netaddr (>= 0.7.12),
+ python-neutronclient (>= 1:2.3.6),
+ python-novaclient (>= 1:2.18.0),
+ python-oslo.config (>= 1:1.4.0),
+ python-oslo.db (>= 1.0.0),
+ python-oslo.i18n (>= 1.0.0),
+ python-oslo.messaging (>= 1.4.0),
+ python-oslo.utils (>= 1.0.0),
+ python-oslosphinx (>= 2.2.0),
  python-paste,
- python-pastedeploy,
- python-routes,
+ python-pastedeploy (>= 1.5.0),
+ python-pbr (>= 0.6),
+ python-posix-ipc,
+ python-psycopg2,
+ python-requests (>= 1.2.1),
+ python-routes (>= 1.12.3),
+ python-saharaclient (>= 0.7.3),
  python-setuptools,
- python-six,
- python-sqlalchemy (>= 0.7.8),
- python-swiftclient,
+ python-six (>= 1.7.0),
+ python-sphinx (>= 1.1.2),
+ python-sqlalchemy (>= 0.8.4),
+ python-stevedore (>= 1.0.0),
+ python-swiftclient (>= 2.2.0),
+ python-troveclient (>= 1:1.0.4),
  python-webob (>= 1.2.3),
- python-yaml,
+ python-yaml (>= 3.1.0),
  ${misc:Depends},
  ${python:Depends}
 Description: OpenStack orchestration service - Python files

=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2014-10-05 02:14:58 +0000
@@ -0,0 +1,37 @@
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -3,9 +3,8 @@
+ # process, which may cause wedges in the gate later.
+ 
+ pbr>=0.6,!=0.7,<1.0
+-argparse
+ Babel>=1.3
+-eventlet>=0.15.1
++eventlet>=0.13.0
+ greenlet>=0.3.2
+ httplib2>=0.7.5
+ iso8601>=0.1.9
+@@ -32,9 +31,8 @@
+ python-swiftclient>=2.2.0
+ python-troveclient>=1.0.4
+ PyYAML>=3.1.0
+-qpid-python
+ requests>=1.2.1,!=2.4.0
+-Routes>=1.12.3,!=2.0
++Routes>=1.12.3
+ six>=1.7.0
+ SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
+ sqlalchemy-migrate>=0.9.1,!=0.9.2
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -3,9 +3,8 @@
+ # process, which may cause wedges in the gate later.
+ 
+ # Hacking already pins down pep8, pyflakes and flake8
+-hacking>=0.8.0,<0.9
++hacking>=0.8.0
+ coverage>=3.6
+-discover
+ lockfile>=0.8
+ mock>=1.0
+ mox>=0.5.3

=== removed file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-07-21 13:15:33 +0000
+++ debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-diff --git a/requirements.txt b/requirements.txt
-index 7c0c207..180f257 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -23,9 +23,8 @@ python-novaclient>=2.17.0
- python-swiftclient>=2.0.2
- python-troveclient>=1.0.4
- PyYAML>=3.1.0
--qpid-python
- requests>=1.1
--Routes>=1.12.3,!=2.0
-+Routes>=1.12.3
- six>=1.7.0
- SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
- sqlalchemy-migrate>=0.9.1
-

=== modified file 'debian/rules'
--- debian/rules	2014-08-06 17:15:26 +0000
+++ debian/rules	2014-10-05 02:14:58 +0000
@@ -7,7 +7,7 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	testr init && testr run || true
+	testr init && testr run
 endif
 
 override_dh_clean:

=== modified file 'debian/watch'
--- debian/watch	2013-08-08 13:55:17 +0000
+++ debian/watch	2014-10-05 02:14:58 +0000
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
- https://launchpad.net/heat/+download https://launchpad.net/heat/.*/.*/.*/heat-(.*)\.tar\.gz
+ http://tarballs.openstack.org/heat heat-(.*)\.tar\.gz