Skip to content

Commit

Permalink
update tox.ini to remove hand written per-env-statements
Browse files Browse the repository at this point in the history
  • Loading branch information
fdambrine committed Oct 23, 2017
1 parent daec8c4 commit 084c6cf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ python:
- '3.4'
- '3.5'
install:
- travis_retry pip install -r requirements-${TRAVIS_PYTHON_VERSION}.txt --allow-external
- travis_retry pip install -e .
argparse
- travis_retry pip install coveralls
- travis_retry pip install coverage
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,8 @@ def _get_specific_requirements():
}
params['install_requires'] = list(REQS)
params['test_suite'] = 'unittest.collector'
params['extras_require'] = {
'doc': ['Sphinx>=1.0.5']
}

setup(**params)
10 changes: 4 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ envlist=py27,py33,py34,pypy,docs,self27,cov27

# Default settings for py27, py33, py34 and pypy
[testenv]
deps=-r{toxinidir}/requirements.txt
deps=-e {toxinidir}
commands=python -m unittest discover []

[testenv:jython]
Expand All @@ -14,23 +14,21 @@ commands=unit2 discover []
[testenv:docs]
basepython=python2.7
changedir=docs
deps=-r{toxinidir}/requirements-2.7.txt
-r{toxinidir}/requirements-docs.txt
deps=-e {toxinidir}[doc]
commands=sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

[testenv:py27]
deps=-r{toxinidir}/requirements-2.7.txt

[testenv:self27]
basepython=python2.7
deps=-r{toxinidir}/requirements-2.7.txt
deps=-e {toxinidir}
setenv=PYTHONPATH={toxinidir}
commands=python -m nose2.__main__ []

[testenv:cov27]
basepython=python2.7
deps=coverage>=3.3
-r{toxinidir}/requirements-2.7.txt
deps=-e {toxinidir}
commands=coverage erase
coverage run -m unittest discover []
coverage report --include=*nose2* --omit=*nose2/tests*
Expand Down

0 comments on commit 084c6cf

Please sign in to comment.