diff --git a/MANIFEST.in b/MANIFEST.in index 59aa5b001..304975404 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,6 +10,7 @@ exclude .mailmap exclude .travis.yml exclude pip/_vendor/Makefile exclude tox.ini +exclude dev-requirements.txt recursive-include pip/_vendor *.pem recursive-include docs Makefile *.rst *.py *.bat diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 000000000..dc578b7c3 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,10 @@ +https://github.com/spulec/freezegun/archive/master.zip#egg=freezegun +pretend +pytest +pytest-capturelog +pytest-cov +pytest-timeout +pytest-xdist +mock +scripttest>=1.3 +https://github.com/pypa/virtualenv/archive/develop.zip#egg=virtualenv diff --git a/tox.ini b/tox.ini index 33635e143..086f69f7a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,38 +1,22 @@ [tox] -envlist = - docs,packaging,pep8,py3pep8,py26,py27,py32,py33,py34,pypy +envlist = docs, packaging, pep8, py3pep8, py26, py27, py32, py33, py34, pypy [testenv] -deps = - https://github.com/spulec/freezegun/archive/master.zip#egg=freezegun - pretend - pytest - pytest-capturelog - pytest-cov - pytest-timeout - pytest-xdist - mock - scripttest>=1.3 - https://github.com/pypa/virtualenv/archive/develop.zip#egg=virtualenv -commands = - py.test --timeout 300 [] -install_command = - python -m pip install --pre {opts} {packages} +deps = -r{toxinidir}/dev-requirements.txt +commands = py.test --timeout 300 [] +install_command = python -m pip install --pre {opts} {packages} [testenv:py26] -install_command = - pip install --pre {opts} {packages} +install_command = pip install --pre {opts} {packages} [testenv:docs] deps = sphinx basepython = python2.7 -commands = - sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html +commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html [testenv:packaging] deps = check-manifest -commands = - check-manifest +commands = check-manifest [testenv:pep8] basepython = python2.7 @@ -44,7 +28,6 @@ basepython = python3.3 deps = flake8 commands = flake8 . - [flake8] exclude = .tox,*.egg,build,_vendor,data select = E,W,F