Fix python 3.3 test configuration

It is no longer necessary to install testrepository from bzr,
so don't. That means we no longer need a separate py33
environment definition, or the special requirements file.

Do not use distribute in the test virtualenvs.

Change-Id: I1c0002d3992e25e7e0927eca85ccd5e4d57ee7d1

3 files changed, 2 insertions, 25 deletions

diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
deleted file mode 100644
index ffcd2f3..0000000
--- a/test-requirements-py3.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-hacking>=0.5.3,<0.6
-
-discover
-fixtures>=0.3.12
-python-subunit
--e bzr+lp:testrepository#egg=testrepository
-testscenarios<0.5
-testtools>=0.9.29
-
-# when we can require tox>= 1.4, this can go into tox.ini:
-#  [testenv:cover]
-#  deps = {[testenv]deps} coverage
-coverage
-
-# this is required for the docs build jobs
-sphinx
-oslo.sphinx
diff --git a/test-requirements.txt b/test-requirements.txt
index baafe1a..cdd85f5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ hacking>=0.5.3,<0.6
 discover
 fixtures>=0.3.12
 python-subunit
-testrepository>=0.0.13
+testrepository>=0.0.17
 testscenarios<0.5
 testtools>=0.9.29
 
diff --git a/tox.ini b/tox.ini
index e0c8da1..ab5e71b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,5 @@
 [tox]
+distribute = False
 envlist = py26,py27,py33,pep8
 
 [testenv]
@@ -7,9 +8,6 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
-[testenv:py33]
-deps = -r{toxinidir}/test-requirements-py3.txt
-
 [testenv:pep8]
 commands = flake8