diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..ffe2fce --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +six diff --git a/test-requirements.txt b/test-requirements.txt index 3217365..d4f01f6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,6 @@ coverage>=3.6 discover hacking>=0.5.6,<0.8 mock -six #unittest2 python-subunit sphinx>=1.1.2,<1.2 diff --git a/tox.ini b/tox.ini index 00ac095..37901b7 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,8 @@ envlist = pep8, py26, py27, pypy, py33, py34 setenv VIRTUAL_ENV={envdir} usedevelop = True install_command = pip install {opts} {packages} -deps = -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:cover] @@ -16,7 +17,8 @@ commands = coverage report --show-missing [testenv:py26] -deps = -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt unittest2 [tox:jenkins]