Merge "Work toward Python 3.4 support and testing"

This commit is contained in:
Jenkins 2014-09-04 18:40:36 +00:00 committed by Gerrit Code Review
commit 3196026846

View File

@ -1,6 +1,6 @@
[tox]
minversion = 1.6
envlist = py26,py27,py33,pypy,pep8
envlist = py26,py27,py33,py34,pypy,pep8
skipsdist = True
[testenv]
@ -23,6 +23,10 @@ setenv = ZAQAR_TEST_MONGODB=1
deps = -r{toxinidir}/requirements-py3.txt
-r{toxinidir}/test-requirements-py3.txt
[testenv:py34]
deps = -r{toxinidir}/requirements-py3.txt
-r{toxinidir}/test-requirements-py3.txt
[tox:jenkins]
downloadcache = ~/cache/pip