From 01e6713ee2dda7ef16dbe75b4aa4e29b02540703 Mon Sep 17 00:00:00 2001
From: Sirushti Murugesan <sirushti.murugesan@hp.com>
Date: Mon, 29 Jun 2015 09:05:15 +0530
Subject: [PATCH] Remove (test-)requirements-py3.txt files

The requirements gate is failing because there was
a recent change to project-config
I1d254c42e0bc2550ceeb768532448b5797d87caf
which makes sure there are no duplicate entries in requirements
files. Since we have multiple separate requirements
files for 2.7 and 3.4, the newly added condition fails
the requirements job. Let's use environment markers
to fix this like I318750ec9fe471d3df57ad2f5785026dae451242
and have a unified (test-)requirements file.

Change-Id: Iea1adcd5bae7cdbec194197004eb7e2937cafcf9
---
 requirements-py3.txt      | 49 ---------------------------------------
 requirements.txt          |  2 +-
 test-requirements-py3.txt | 18 --------------
 3 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 requirements-py3.txt
 delete mode 100644 test-requirements-py3.txt

diff --git a/requirements-py3.txt b/requirements-py3.txt
deleted file mode 100644
index 8845bc58b8..0000000000
--- a/requirements-py3.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-pbr<2.0,>=0.11
-Babel>=1.3
-dogpile.cache>=0.5.3
-eventlet>=0.17.4
-greenlet>=0.3.2
-httplib2>=0.7.5
-iso8601>=0.1.9
-keystonemiddleware>=1.5.0
-kombu>=3.0.7
-lxml>=2.3
-netaddr>=0.7.12
-oslo.config>=1.11.0 # Apache-2.0
-oslo.concurrency>=2.0.0 # Apache-2.0
-oslo.context>=0.2.0 # Apache-2.0
-oslo.db>=1.10.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
-oslo.log>=1.2.0 # Apache-2.0
-oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
-oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
-oslo.serialization>=1.4.0 # Apache-2.0
-oslo.service>=0.1.0 # Apache-2.0
-oslo.utils>=1.6.0 # Apache-2.0
-osprofiler>=0.3.0 # Apache-2.0
-oslo.versionedobjects>=0.3.0
-PasteDeploy>=1.5.0
-posix-ipc
-pycrypto>=2.6
-python-ceilometerclient>=1.0.13
-python-cinderclient>=1.2.2
-python-glanceclient>=0.18.0
-python-heatclient>=0.3.0
-python-keystoneclient>=1.6.0
-python-neutronclient<3,>=2.3.11
-python-novaclient>=2.22.0
-python-saharaclient>=0.9.0
-python-swiftclient>=2.2.0
-python-troveclient>=1.0.9
-PyYAML>=3.1.0
-requests>=2.5.2
-Routes!=2.0,>=1.12.3
-six>=1.9.0
-SQLAlchemy<1.1.0,>=0.9.7
-sqlalchemy-migrate>=0.9.6
-stevedore>=1.5.0 # Apache-2.0
-WebOb>=1.2.3
diff --git a/requirements.txt b/requirements.txt
index 7473702542..63c4913ba2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -45,7 +45,7 @@ python-swiftclient>=2.2.0
 python-troveclient>=1.0.9
 python-zaqarclient>=0.1.1
 PyYAML>=3.1.0
-qpid-python
+qpid-python;python_version=='2.7'
 requests>=2.5.2
 Routes!=2.0,>=1.12.3
 six>=1.9.0
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
deleted file mode 100644
index 60b8eabf08..0000000000
--- a/test-requirements-py3.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-# Hacking already pins down pep8, pyflakes and flake8
-hacking<0.11,>=0.10.0
-coverage>=3.6
-discover
-mock>=1.0
-mox>=0.5.3
-oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.5.1 # Apache-2.0
-paramiko>=1.13.0
-psycopg2
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0