aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-05-17 22:34:56 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-05-17 22:34:56 -0700
commit5b8126f3fc94290b06f6c4414dbd8b53ad3385dd (patch)
treebfae947007de7663206046e00af02182f1e3483b /tox.ini
parenta212afe2b09c9160b4221cad0827fcefd016328b (diff)
downloadcryptography-5b8126f3fc94290b06f6c4414dbd8b53ad3385dd.tar.gz
cryptography-5b8126f3fc94290b06f6c4414dbd8b53ad3385dd.tar.bz2
cryptography-5b8126f3fc94290b06f6c4414dbd8b53ad3385dd.zip
Move to being a part of the pep8 job
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini13
1 files changed, 6 insertions, 7 deletions
diff --git a/tox.ini b/tox.ini
index 53e277a5..db9b17cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,pypy,py32,py33,py34,docs,pep8,py3pep8,doc8
+envlist = py26,py27,pypy,py32,py33,py34,docs,pep8,py3pep8
[testenv]
# If you add a new dep here you probably need to add it in setup.py as well
@@ -42,23 +42,22 @@ commands =
[testenv:pep8]
deps =
+ doc8
flake8
flake8-import-order
pep8-naming
-commands = flake8 .
+commands =
+ flake8 .
+ doc8 README.rst docs/
[testenv:py3pep8]
-basepython = python3.3
+basepython = python3
deps =
flake8
flake8-import-order
pep8-naming
commands = flake8 .
-[testenv:doc8]
-deps = doc8
-commands = doc8 README.rst docs/
-
[flake8]
exclude = .tox,*.egg
select = E,W,F,N,I