From baf525895d26c19297e09aa1811d63bc1e20fec9 Mon Sep 17 00:00:00 2001
From: Igor Yozhikov <iyozhikov@mirantis.com>
Date: Tue, 22 Jul 2014 19:38:04 +0400
Subject: [PATCH] Update of dependend packages version

* sync with stable/icehouse/requirements.txt from heat repo

Change-Id: Icb845afaaa2dd504dbafd5c04ad147dcdbc32845
---
 .gitreview                    |  4 ---
 debian/control                | 50 ++++++++++++++++++++---------------
 rpm/SPECS/openstack-heat.spec |  4 +--
 3 files changed, 31 insertions(+), 27 deletions(-)
 delete mode 100644 .gitreview

diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 43aaca19..00000000
--- a/.gitreview
+++ /dev/null
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=openstack-ci/openstack/heat-build
diff --git a/debian/control b/debian/control
index 534e4b91..49029845 100644
--- a/debian/control
+++ b/debian/control
@@ -17,11 +17,11 @@ Build-Depends-Indep:
  python-pbr (>= 0.6), python-pbr (<< 1.0),
  python-babel (>= 1.3),
  python-boto (>= 2.4),
- python-ceilometerclient (>=1.0.6),
- python-cinderclient (>=1.0.6),
+ python-ceilometerclient (>= 1.0.6),
+ python-cinderclient (>= 1.0.6),
  python-coverage,
  python-crypto (>= 2.6),
- python-eventlet (>= 0.12.0),
+ python-eventlet (>= 0.13.0),
  python-extras,
  python-glanceclient (>= 1:0.9.0),
  python-greenlet (>= 0.3.2),
@@ -47,14 +47,14 @@ Build-Depends-Indep:
  python-setuptools,
  python-six,
  python-sphinx (>= 1.1.2), python-sphinx (<< 1.2),
- python-sqlalchemy (>= 0.7.8), python-sqlalchemy (<= 0.9.99),
+ python-sqlalchemy (>= 0.7.8), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99),
  python-swiftclient (>= 1.6),
  python-testrepository (>= 0.0.17),
  python-testscenarios (>= 0.4),
  python-testtools (>= 0.9.29),
  python-troveclient (>= 1.0.3),
  python-webob (>= 1.2.3),
- python-yaml,
+ python-yaml (>= 3.1.0),
  testrepository (>= 0.0.17)
 Standards-Version: 3.9.4
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/icehouse/files
@@ -66,34 +66,42 @@ Package: python-heat
 Section: python
 Architecture: all
 Depends:
+ python-pbr (>= 0.6), python-pbr (<< 1.0),
  python-argparse,
  python-boto (>= 2.4),
- python-cinderclient,
- python-crypto,
- python-eventlet (>= 0.12.0),
+ python-cinderclient (>= 1.0.6),
+ python-crypto (>= 2.6),
+ python-eventlet (>= 0.13.0),
  python-extras,
  python-glanceclient,
  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-netaddr (>= 0.7.6),
+ python-keystoneclient (>= 1:0.7.0),
+ python-kombu (>= 2.4.8),
  python-lxml (>= 2.3),
  python-memcache,
- python-migrate,
+ python-migrate (>= 0.8.2), python-migrate (<< 0.8.4) | python-migrate (>> 0.8.4),
  python-mysqldb,
- python-neutronclient (>= 1:2.2.0),
- python-novaclient,
- python-oslo.config,
+ python-neutronclient (>= 1:2.3.4), python-neutronclient (<< 1:3),
+ python-novaclient (>= 2.17.0),
+ python-ceilometerclient (>= 1.0.6),
+ python-troveclient (>= 1.0.3),
+ python-requests (>= 1.1),
+ python-paramiko (>= 1.9.0),
+ python-babel (>= 1.3),
+ python-oslo.config (>= 1:1.2.0),
  python-paste,
- python-pastedeploy,
- python-routes,
+ python-pastedeploy (>= 1.5.0),
+ python-routes (>= 1.12.3),
  python-setuptools,
  python-six,
- python-sqlalchemy (>= 0.7.8),
- python-swiftclient,
+ python-sqlalchemy (>= 0.7.8), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99),
+ python-swiftclient  (>= 1.6),
  python-webob (>= 1.2.3),
- python-yaml,
+ python-yaml (>= 3.1.0),
+ python-qpid,
  ${misc:Depends},
  ${python:Depends}
 Description: OpenStack orchestration service - Python files
diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec
index bebefddb..79139d9e 100644
--- a/rpm/SPECS/openstack-heat.spec
+++ b/rpm/SPECS/openstack-heat.spec
@@ -191,9 +191,9 @@ Requires: python-heatclient >= 0.2.3
 Requires: python-babel >= 1.3
 Requires: MySQL-python
 
-Requires: python-paste-deploy1.5 >= 1.5.0
+Requires: python-paste-deploy >= 1.5.0
 Requires: python-routes1.12 >= 1.12.3
-Requires: python-sqlalchemy >= 0.7.8, python-sqlalchemy <= 0.9.99
+Requires: python-sqlalchemy >= 0.7.8, python-sqlalchemy < 0.9.5, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99
 Requires: python-webob >= 1.2.3
 Requires: python-requests >= 1.1
 Requires: python-ceilometerclient >= 1.0.6
-- 
2.45.2