Remove differences between Python 2.x and 3.x versions

We had these differences in requirements:
- mox in 2.x vs mox3 in 3.x: mox3 works for 2.x as well, so use it
  everywhere, mox3 version bumped to match global-requirements;
- mock in 2.x, absent in 3.x (in stdlib): it's installable on 3.x, so we
  can leave it in requirements;
- six in 2.x, absent in 3.x: is directly required by this lib, has been
  installed indirectly through hacking.

test-requirements files were identical.

This change allows us to build universal wheels and avoid confusion, see ML:
http://lists.openstack.org/pipermail/openstack-dev/2014-September/044663.html

Change-Id: I8bd2d561bf966c6dc1394a7d29d26f056d162fa9

6 files changed, 5 insertions, 23 deletions

diff --git a/oslotest/__init__.py b/oslotest/__init__.py
index 2c9a3cd..3d49b6a 100644
--- a/oslotest/__init__.py
+++ b/oslotest/__init__.py
@@ -14,4 +14,4 @@ import six
 
 
 six.add_move(six.MovedModule('mock', 'mock', 'unittest.mock'))
-six.add_move(six.MovedModule('mox', 'mox', 'mox3.mox'))
+six.add_move(six.MovedModule('mox', 'mox3.mox', 'mox3.mox'))
diff --git a/requirements-py3.txt b/requirements-py3.txt
deleted file mode 100644
index 6789ace..0000000
--- a/requirements-py3.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-discover
-fixtures>=0.3.14
-python-subunit>=0.0.18
-testscenarios>=0.4
-testrepository>=0.0.18
-testtools>=0.9.34
-mox3>=0.7.0
diff --git a/requirements.txt b/requirements.txt
index 7c99744..da21f13 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,4 @@ testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.34
 mock>=1.0
-mox>=0.5.3
+mox3>=0.7.0
diff --git a/setup.cfg b/setup.cfg
index bf3ce7d..41dfe33 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,3 +39,6 @@ upload-dir = doc/build/html
 
 [pbr]
 warnerrors = true
+
+[wheel]
+universal = true
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
deleted file mode 100644
index cbbd4e0..0000000
--- a/test-requirements-py3.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-hacking>=0.9.2,<0.10
-
-# when we can require tox>= 1.4, this can go into tox.ini:
-#  [testenv:cover]
-#  deps = {[testenv]deps} coverage
-coverage>=3.6
-
-# this is required for the docs build jobs
-sphinx>=1.1.2,!=1.2.0,<1.3
-oslosphinx>=2.2.0.0a2
diff --git a/tox.ini b/tox.ini
index 24cdfc9..134b31e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,10 +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}/requirements-py3.txt
-       -r{toxinidir}/test-requirements-py3.txt
-
 [testenv:pep8]
 commands = flake8