aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-09-15 20:51:32 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-09-15 20:51:32 -0400
commitd93aa99636b06d5d403130425098b2f0cc1b516e (patch)
tree30cfa362a5440fe99de2ffd640f74856ca703d53 /tox.ini
parent4e4bdb093b9038bd6896f234ac35387505e5f346 (diff)
parent8edd68f88bfe0f88addf4ba8e69bd920a7995b44 (diff)
downloadcryptography-d93aa99636b06d5d403130425098b2f0cc1b516e.tar.gz
cryptography-d93aa99636b06d5d403130425098b2f0cc1b516e.tar.bz2
cryptography-d93aa99636b06d5d403130425098b2f0cc1b516e.zip
Merge pull request #2337 from reaperhulk/py35-and-pypy
Python 3.5 support
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index c24d6fbe..219da545 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,pypy,py33,py34,docs,pep8,py3pep8
+envlist = py26,py27,pypy,py33,py34,py35,docs,pep8,py3pep8
[testenv]
# If you add a new dep here you probably need to add it in setup.py as well