diff --git a/integration/scripts/files/deprecated-elements/fedora-guest/install.d/15-trove-dep b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/15-trove-dep index 3bda0565a6..485c37427b 100755 --- a/integration/scripts/files/deprecated-elements/fedora-guest/install.d/15-trove-dep +++ b/integration/scripts/files/deprecated-elements/fedora-guest/install.d/15-trove-dep @@ -10,8 +10,7 @@ dnf install -y python-devel libxml2-devel libxslt-devel python-setuptools \ python-sqlalchemy python-lxml \ python-routes python-eventlet python-webob \ python-kombu python-paste-deploy python-paste python-netaddr \ - python-httplib2 python-iso8601 python-pip python-mysql \ - python-migrate python-anyjson gcc python-pexpect + python-pip python-mysql python-migrate python-anyjson gcc python-pexpect # pick up the requirements file left for us by # extra-data.d/15-reddwarf-dep diff --git a/integration/scripts/files/requirements/fedora-requirements.txt b/integration/scripts/files/requirements/fedora-requirements.txt index c388168198..6da5044655 100644 --- a/integration/scripts/files/requirements/fedora-requirements.txt +++ b/integration/scripts/files/requirements/fedora-requirements.txt @@ -6,7 +6,6 @@ python-cinderclient>=1.1.0 python-keystoneclient>=2.0.0,!=2.1.0 # Apache-2.0 kombu>=2.5.0 babel>=1.3 -python-heatclient>=0.3.0 jinja2>=2.6 PyMySQL>=0.6.2 # MIT License python-neutronclient>=2.3.11,<3 diff --git a/integration/scripts/files/requirements/ubuntu-requirements.txt b/integration/scripts/files/requirements/ubuntu-requirements.txt index 51c0af4da5..3dcc81c367 100644 --- a/integration/scripts/files/requirements/ubuntu-requirements.txt +++ b/integration/scripts/files/requirements/ubuntu-requirements.txt @@ -6,7 +6,6 @@ python-cinderclient>=1.1.0 python-keystoneclient>=2.0.0,!=2.1.0 # Apache-2.0 kombu>=2.5.0 babel -python-heatclient>=0.2.9 jinja2 PyMySQL>=0.6.2 # MIT License python-neutronclient>=2.3.6,<3 diff --git a/integration/scripts/projects-list b/integration/scripts/projects-list index eacd4d8e8b..b42007cf32 100644 --- a/integration/scripts/projects-list +++ b/integration/scripts/projects-list @@ -9,4 +9,3 @@ python-openstackclient python-novaclient python-troveclient python-neutronclient -python-heatclient diff --git a/requirements.txt b/requirements.txt index 6a2ea70385..51fe4c39c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,9 +8,7 @@ WebOb>=1.7.1 # MIT PasteDeploy>=1.5.0 # MIT Paste>=2.0.2 # MIT netaddr>=0.7.18 # BSD -httplib2>=0.9.1 # MIT lxml!=3.7.0,>=3.4.1 # BSD -python-heatclient>=1.10.0 # Apache-2.0 python-novaclient>=9.1.0 # Apache-2.0 python-cinderclient>=3.3.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 @@ -19,7 +17,6 @@ python-designateclient>=2.7.0 # Apache-2.0 python-neutronclient>=6.7.0 # Apache-2.0 python-glanceclient>=2.8.0 # Apache-2.0 python-troveclient>=2.2.0 # Apache-2.0 -iso8601>=0.1.11 # MIT jsonschema>=3.2.0 # MIT Jinja2>=2.10 # BSD License (3 clause) pexpect!=3.3,>=3.1 # ISC License