From 0045a95bde9291d68b8ecfaa11f7751562f0f1bb Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Thu, 11 Sep 2014 19:39:05 +0400 Subject: [PATCH] Update requirements for Heat packages Change-Id: I80b5033798f0aca1327db38e7581d19cf73ab786 --- debian/control | 7 +++++-- debian/patches/fix-requirements.patch | 13 ------------ ...y-patch-to-allow-smooth-migration-aw.patch | 21 ------------------- rpm/SPECS/openstack-heat.spec | 14 ++++++++----- 4 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 debian/patches/fix-requirements.patch diff --git a/debian/control b/debian/control index 6dc84f37..6b736d9b 100644 --- a/debian/control +++ b/debian/control @@ -79,10 +79,12 @@ Depends: python-greenlet (>= 0.3.2), python-httplib2 (>= 0.7.5), python-iso8601 (>= 0.1.9), + python-keystonemiddleware (>= 1.0.0), python-kombu (>= 2.4.8), python-lxml (>= 2.3), python-netaddr (>= 0.7.6), - python-oslo.config (>= 1.2.1), + python-oslo.config (>= 1.4.0), + python-oslo.i18n (>= 0.2.0), python-oslo.messaging (>= 1.3.0), python-oslo.db (>= 0.2.0), python-pastedeploy (>= 1.5.0), @@ -96,10 +98,11 @@ Depends: python-keystoneclient (>= 0.9.0), python-neutronclient (>= 1:2.3.5), python-novaclient (>= 2.17.0), + python-saharaclient (>= 0.6.0), python-swiftclient (>= 2.0.2), python-troveclient (>= 1.0.4), python-yaml (>= 3.1.0), - qpid-python, + python-qpid, python-requests (>= 1.1), python-routes (>= 1.12.3), python-routes ( << 2.0) | python-routes (>> 2.0), python-six (>= 1.7.0), diff --git a/debian/patches/fix-requirements.patch b/debian/patches/fix-requirements.patch deleted file mode 100644 index d330eddf..00000000 --- a/debian/patches/fix-requirements.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index f2916cb..3be9a17 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -22,7 +22,6 @@ 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 - six>=1.6.0 - diff --git a/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch b/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch index 3a0d6300..ea3cafcd 100644 --- a/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch +++ b/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch @@ -68,24 +68,3 @@ index 0defb10..0c1e14e 100644 + l = ord(padded[-1]) + plain = padded[:-l] + return plain -diff --git a/requirements.txt b/requirements.txt -index eb33166..7da29a2 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -7,6 +7,7 @@ iso8601>=0.1.9 - keystonemiddleware>=1.0.0 - kombu>=2.4.8 - lxml>=2.3 -+M2Crypto - netaddr>=0.7.6 - oslo.config>=1.4.0.0a3 - oslo.db>=0.2.0 # Apache-2.0 -@@ -15,7 +16,6 @@ oslo.messaging>=1.3.0 - PasteDeploy>=1.5.0 - pbr>=0.6,!=0.7,<1.0 - posix_ipc --pycrypto>=2.6 - python-ceilometerclient>=1.0.6 - python-cinderclient>=1.0.7 - python-glanceclient>=0.13.1 - diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec index 86b319f2..91cde33f 100644 --- a/rpm/SPECS/openstack-heat.spec +++ b/rpm/SPECS/openstack-heat.spec @@ -55,15 +55,15 @@ BuildRequires: python-paramiko BuildRequires: python-sphinx >= 1.2.1, python-sphinx < 1.3 # These are required to build due to the requirements check added BuildRequires: python-paste-deploy >= 1.5.0 -BuildRequires: python-routes >= 1.12.3 +BuildRequires: python-routes >= 1.12.3, python-routes < 2.0 BuildRequires: python-sqlalchemy >= 0.7.8, python-sqlalchemy <= 0.9.99 BuildRequires: python-webob >= 1.2.3 BuildRequires: python-pbr BuildRequires: python-d2to1 %if 0%{?with_doc} -BuildRequires: python-oslo-config >= 1.2.0 -BuildRequires: python-oslo-i18n +BuildRequires: python-oslo-i18n >= 0.2.0 +BuildRequires: python-oslo-config >= 1.4.0 BuildRequires: python-oslo-messaging >= 1.3.0 BuildRequires: python-oslo-db >= 0.2.0 BuildRequires: python-saharaclient @@ -71,6 +71,7 @@ BuildRequires: python-cinderclient BuildRequires: python-keystoneclient BuildRequires: python-novaclient BuildRequires: python-neutronclient +BuildRequires: python-saharaclient BuildRequires: python-swiftclient BuildRequires: python-heatclient BuildRequires: python-ceilometerclient @@ -177,12 +178,14 @@ Requires: python-eventlet >= 0.13.0 Requires: python-greenlet >= 0.3.2 Requires: python-httplib2 >= 0.7.5 Requires: python-iso8601 >= 0.1.9 +Requires: python-keystonemiddleware >= 1.0.0 Requires: python-kombu >= 2.4.8 Requires: python-lxml >= 2.3 Requires: python-netaddr >= 0.7.6 -Requires: python-oslo-config >= 1.2.0 +Requires: python-oslo-config >= 1.4.0 Requires: python-oslo-messaging >= 1.3.0 Requires: python-oslo-db >= 0.2.0 +Requires: python-oslo-i18n >= 0.2.0 Requires: python-paste-deploy >= 1.5.0 Requires: python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0 Requires: python-posix_ipc @@ -194,12 +197,13 @@ Requires: python-heatclient >= 0.2.9 Requires: python-keystoneclient >= 0.9.0 Requires: python-neutronclient >= 2.3.5, python-neutronclient < 3 Requires: python-novaclient >= 2.17.0 +Requires: python-saharaclient >= 0.6.0 Requires: python-swiftclient >= 2.0.2 Requires: python-troveclient >= 1.0.4 Requires: PyYAML >= 3.1.0 Requires: python-qpid Requires: python-requests >= 1.1 -Requires: python-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0, +Requires: python-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0 Requires: python-six >= 1.7.0 Requires: python-sqlalchemy >= 0.7.8, python-sqlalchemy < 0.9.5, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99 Requires: python-migrate >= 0.9.1 -- 2.45.2