From 9af2a9fa46a47055fdfe3a23c7c0808b3744c661 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Wed, 15 Jul 2015 15:29:43 +1200
Subject: [PATCH] Fixup dependencies.

- Don't put deps in tox.ini. They aren't synced.
- Remove unneeded requirements-py3.txt.

Change-Id: I57851a0004fcfa360e5f35e18f869a0af0ca22fb
---
 requirements-py3.txt  | 14 --------------
 test-requirements.txt |  3 ++-
 tox.ini               | 20 +-------------------
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 requirements-py3.txt

diff --git a/requirements-py3.txt b/requirements-py3.txt
deleted file mode 100644
index cf57ecc9..00000000
--- a/requirements-py3.txt
+++ /dev/null
@@ -1,14 +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,>=1.3
-Babel>=1.3
-stevedore>=1.5.0 # Apache-2.0
-six>=1.9.0
-iso8601>=0.1.9
-zake>=0.1.6 # Apache-2.0
-msgpack-python>=0.4.0
-fasteners>=0.7 # Apache-2.0
-retrying!=1.3.0,>=1.2.3 # Apache-2.0
-oslo.utils>=1.9.0 # Apache-2.0
-oslo.serialization>=1.4.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 2fa21c2a..e51e9b4d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,10 +2,11 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+hacking>=0.10.0,<0.11
 pep8==1.5.7
 pyflakes==0.8.1
 flake8<=2.4.1,>=2.2.4
-discover
+doc8 # Apache-2.0
 mock>=1.1;python_version!='2.6'
 mock==1.0.1;python_version=='2.6'
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
diff --git a/tox.ini b/tox.ini
index d5038584..d764076a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,33 +4,23 @@ skipsdist = True
 envlist = py26,py27,py34,py27-zookeeper,py34-zookeeper,py27-redis,py34-redis,py27-sentinel,py34-sentinel,py27-memcached,py34-memcached,py27-postgresql,py34-postgresql,py27-mysql,py34-mysql,pep8
 
 [testenv]
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
 install_command = pip install -U {opts} {packages}
 usedevelop = True
 commands = python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:venv]
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
 commands = {posargs}
 
 [testenv:py27]
-deps = {[testenv]deps}
-    doc8
 commands = python setup.py testr --slowest --testr-args="{posargs}"
     {toxinidir}/run-examples.sh
     doc8 doc/source
 
-[testenv:py34]
-deps = -r{toxinidir}/requirements-py3.txt
-       -r{toxinidir}/test-requirements.txt
-
 [testenv:py27-zookeeper]
 commands = {toxinidir}/setup-zookeeper-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:py34-zookeeper]
-deps = {[testenv:py34]deps}
 basepython = python3.4
 commands = {toxinidir}/setup-zookeeper-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
@@ -38,7 +28,6 @@ commands = {toxinidir}/setup-zookeeper-env.sh python setup.py testr --slowest --
 commands = {toxinidir}/setup-redis-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:py34-redis]
-deps = {[testenv:py34]deps}
 basepython = python3.4
 commands = {toxinidir}/setup-redis-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
@@ -46,7 +35,6 @@ commands = {toxinidir}/setup-redis-env.sh python setup.py testr --slowest --test
 commands = {toxinidir}/setup-sentinel-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:py34-sentinel]
-deps = {[testenv:py34]deps}
 basepython = python3.4
 commands = {toxinidir}/setup-sentinel-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
@@ -54,7 +42,6 @@ commands = {toxinidir}/setup-sentinel-env.sh python setup.py testr --slowest --t
 commands = {toxinidir}/setup-memcached-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:py34-memcached]
-deps = {[testenv:py34]deps}
 basepython = python3.4
 commands = {toxinidir}/setup-memcached-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
@@ -62,7 +49,6 @@ commands = {toxinidir}/setup-memcached-env.sh python setup.py testr --slowest --
 commands = {toxinidir}/setup-postgresql-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:py34-postgresql]
-deps = {[testenv:py34]deps}
 basepython = python3.4
 commands = {toxinidir}/setup-postgresql-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
@@ -70,7 +56,6 @@ commands = {toxinidir}/setup-postgresql-env.sh python setup.py testr --slowest -
 commands = {toxinidir}/setup-mysql-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:py34-mysql]
-deps = {[testenv:py34]deps}
 basepython = python3.4
 commands = {toxinidir}/setup-mysql-env.sh python setup.py testr --slowest --testr-args="{posargs}"
 
@@ -78,13 +63,10 @@ commands = {toxinidir}/setup-mysql-env.sh python setup.py testr --slowest --test
 commands = python setup.py testr --slowest --coverage --testr-args="{posargs}"
 
 [testenv:docs]
-deps = {[testenv]deps}
-    doc8
 commands = doc8 doc/source
     python setup.py build_sphinx
 
 [testenv:pep8]
-deps = hacking>=0.10.0,<0.11
 commands =
     flake8