diff options
| author | Chris Wolfe <chriswwolfe@gmail.com> | 2016-11-05 23:00:37 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-11-06 00:00:37 -0400 |
| commit | 0b26ab263aa201ba8d6bb8136cfd6f75257f5273 (patch) | |
| tree | e5f1b63789c0fdb46137e7016914a5f4a927d573 | |
| parent | b924696b2e8731f39696584d12cceeb3aeb2d874 (diff) | |
| download | cryptography-0b26ab263aa201ba8d6bb8136cfd6f75257f5273.tar.gz cryptography-0b26ab263aa201ba8d6bb8136cfd6f75257f5273.tar.bz2 cryptography-0b26ab263aa201ba8d6bb8136cfd6f75257f5273.zip | |
tox 2.4 has new syntax for specifying extras (#3212)
* tox 2.4 allows has new extras syntax
* specify minimum version for tox in dev-requirements.txt
| -rw-r--r-- | dev-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index 2c171878..ab458448 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,7 +2,7 @@ clint coverage invoke requests -tox +tox >= 2.4.1 twine -e .[test,docstest,pep8test] -e vectors @@ -2,9 +2,10 @@ envlist = py26,py27,pypy,py33,py34,py35,docs,pep8,py3pep8 [testenv] +extras = + test deps = coverage - .[test] ./vectors passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME commands = @@ -17,8 +18,8 @@ commands = coverage report -m [testenv:docs] -deps = - .[docstest] +extras = + docstest basepython = python2.7 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html @@ -44,15 +45,15 @@ commands = py.test --capture=no --strict {posargs} [testenv:pep8] -deps = - .[pep8test] +extras = + pep8test commands = flake8 . [testenv:py3pep8] basepython = python3 -deps = - .[pep8test] +extras = + pep8test commands = flake8 . |