summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-10-31 14:59:13 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2013-10-31 14:59:13 -0700
commit484713ffd0cb96ee36173363b6733d6b3dd32b4d (patch)
tree55c68e5cdb926202c7fdd6cfbd3c608fe577c102 /tox.ini
parent38f34557e432f98cc8a023e621b5efe525ef886c (diff)
parent0e5fd074b79f6dc86bcc643772b731594bcbb011 (diff)
downloadcryptography-484713ffd0cb96ee36173363b6733d6b3dd32b4d.tar.gz
Merge branch 'master' into fernet
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini7
1 files changed, 6 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 57b424123..7f02eaba3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,pypy,py32,py33,docs,pep8
+envlist = py26,py27,pypy,py32,py33,docs,pep8,py3pep8
[testenv]
deps =
@@ -23,5 +23,10 @@ commands =
deps = flake8
commands = flake8 .
+[testenv:py3pep8]
+basepython = python3.3
+deps = flake8
+commands = flake8 .
+
[flake8]
exclude = .tox,*.egg