Reorganizing tox stuff and making py3-specific requirements

test-requirements.txt

@@ -1,10 +0,0 @@
-#
-# Test requirements
-#
-
-nose
-mock >= 1.0.1, < 1.1
-passlib
-coverage
-coveralls
-unittest2

test/utils/run_tests.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -xe
+#!/bin/sh -x
 
 if [ "${TARGET}" = "sanity" ]; then
     ./test/code-smell/replace-urlopen.sh .

tox.ini

@@ -1,8 +1,14 @@
 [tox]
 envlist = py26,py27,py34,py35
 
+[testenv:py34]
+deps = -r{toxinidir}/test/utils/tox/requirements-py3.txt
+
+[testenv:py35]
+deps = -r{toxinidir}/test/utils/tox/requirements-py3.txt
+
 [testenv]
-deps = -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test/utils/tox/requirements.txt
 whitelist_externals = make
 commands =
     python --version