aboutsummaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorPat Ferate <pferate+github@gmail.com>2014-08-11 08:28:05 -0700
committerPat Ferate <pferate+github@gmail.com>2014-08-11 08:28:05 -0700
commit7e251b7665b05d4b930cfd67b5bc381d409614c3 (patch)
treeca31c9f7a98b507e6d83f44d535419e337a046d6 /tox.ini
parent02d5f3523f0a5bbb4e02b0686cc3eb9f7c4b3e76 (diff)
parent2eac920bad199b4073fa26772eaa562abd829d9f (diff)
downloadoauth2client-7e251b7665b05d4b930cfd67b5bc381d409614c3.tar.gz
Merge branch 'master' of https://github.com/google/oauth2client
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 16e9a55..5a19476 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ envlist = py26openssl13, py26openssl14,
deps = keyring
mox
pycrypto==2.6
- django==1.2
+ django>=1.5,<1.6
webtest
nose
setenv = PYTHONPATH=../google_appengine