diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-31 14:59:13 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-31 14:59:13 -0700 |
| commit | 484713ffd0cb96ee36173363b6733d6b3dd32b4d (patch) | |
| tree | 55c68e5cdb926202c7fdd6cfbd3c608fe577c102 | |
| parent | 38f34557e432f98cc8a023e621b5efe525ef886c (diff) | |
| parent | 0e5fd074b79f6dc86bcc643772b731594bcbb011 (diff) | |
| download | cryptography-484713ffd0cb96ee36173363b6733d6b3dd32b4d.tar.gz cryptography-484713ffd0cb96ee36173363b6733d6b3dd32b4d.tar.bz2 cryptography-484713ffd0cb96ee36173363b6733d6b3dd32b4d.zip | |
Merge branch 'master' into fernet
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | tox.ini | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 97105375..cf6ecefa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ env: - TOX_ENV=pypy CC=clang - TOX_ENV=docs - TOX_ENV=pep8 + - TOX_ENV=py3pep8 install: - "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true" @@ -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 |