From 7e1c3b23e4734e546a290edf4d22766d31046a63 Mon Sep 17 00:00:00 2001
From: INADA Naoki <inada-n@klab.com>
Date: Wed, 9 Jul 2014 01:14:19 +0900
Subject: [PATCH 1/2] Update django to 1.6.5

---
 tests/test_django_orm.py | 5 +++--
 tox.ini                  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/test_django_orm.py b/tests/test_django_orm.py
index c80ff1d..6394389 100644
--- a/tests/test_django_orm.py
+++ b/tests/test_django_orm.py
@@ -32,7 +32,7 @@ import unittest
 # Ensure that if app engine is available, we use the correct django from it
 try:
   from google.appengine.dist import use_library
-  use_library('django', '1.2')
+  use_library('django', '1.5')
 except ImportError:
   pass
 
@@ -41,7 +41,8 @@ from oauth2client.client import Flow
 
 # Mock a Django environment
 os.environ['DJANGO_SETTINGS_MODULE'] = 'django_settings'
-sys.modules['django_settings'] = imp.new_module('django_settings')
+sys.modules['django_settings'] = django_settings = imp.new_module('django_settings')
+django_settings.SECRET_KEY = 'xyzzy'
 
 from oauth2client.django_orm import CredentialsField
 from oauth2client.django_orm import FlowField
diff --git a/tox.ini b/tox.ini
index 33f3af8..031641c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ deps = keyring
        mox
        pyopenssl
        pycrypto==2.6
-       django==1.2
+       django==1.6.5
        webtest
        nose
 setenv = PYTHONPATH=../google_appengine

From 7ca9b4027798f6bec0ca5a54418c0ac5e66976bc Mon Sep 17 00:00:00 2001
From: INADA Naoki <inada-n@klab.com>
Date: Mon, 11 Aug 2014 10:57:32 +0900
Subject: [PATCH 2/2] Use Django 1.5

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 031641c..0f54225 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ deps = keyring
        mox
        pyopenssl
        pycrypto==2.6
-       django==1.6.5
+       django>=1.5,<1.6
        webtest
        nose
 setenv = PYTHONPATH=../google_appengine