Move dev reqs from tox.ini to dev-requirements.txt

Then folks who don't use tox can do `pip install -r
dev-requirements.txt`

Since this is pip, which created the idea of requirements files, it
seems nice for the project to have one to showcase the idea.

Also cleaned up the tox.ini and made it more compact (fits now on my
laptop screen) and consistent.
This commit is contained in:
Marc Abramowitz 2014-12-17 22:20:33 -08:00
parent e4d12f96af
commit ce3ceb7bd1
3 changed files with 18 additions and 24 deletions

View File

@ -10,6 +10,7 @@ exclude .mailmap
exclude .travis.yml exclude .travis.yml
exclude pip/_vendor/Makefile exclude pip/_vendor/Makefile
exclude tox.ini exclude tox.ini
exclude dev-requirements.txt
recursive-include pip/_vendor *.pem recursive-include pip/_vendor *.pem
recursive-include docs Makefile *.rst *.py *.bat recursive-include docs Makefile *.rst *.py *.bat

10
dev-requirements.txt Normal file
View File

@ -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

31
tox.ini
View File

@ -1,38 +1,22 @@
[tox] [tox]
envlist = envlist = docs, packaging, pep8, py3pep8, py26, py27, py32, py33, py34, pypy
docs,packaging,pep8,py3pep8,py26,py27,py32,py33,py34,pypy
[testenv] [testenv]
deps = deps = -r{toxinidir}/dev-requirements.txt
https://github.com/spulec/freezegun/archive/master.zip#egg=freezegun commands = py.test --timeout 300 []
pretend install_command = python -m pip install --pre {opts} {packages}
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}
[testenv:py26] [testenv:py26]
install_command = install_command = pip install --pre {opts} {packages}
pip install --pre {opts} {packages}
[testenv:docs] [testenv:docs]
deps = sphinx deps = sphinx
basepython = python2.7 basepython = python2.7
commands = commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
[testenv:packaging] [testenv:packaging]
deps = check-manifest deps = check-manifest
commands = commands = check-manifest
check-manifest
[testenv:pep8] [testenv:pep8]
basepython = python2.7 basepython = python2.7
@ -44,7 +28,6 @@ basepython = python3.3
deps = flake8 deps = flake8
commands = flake8 . commands = flake8 .
[flake8] [flake8]
exclude = .tox,*.egg,build,_vendor,data exclude = .tox,*.egg,build,_vendor,data
select = E,W,F select = E,W,F