openstack/deb-python-oauth2client
Code Issues Proposed changes

Merge pull request #22 from methane/djang-1.6.5

Browse Source 
Update django to 1.6.5
This commit is contained in:
Craig Citro
2014-08-10 23:01:27 -07:00
parent 00bde9ab3a 7ca9b40277
commit 2eac920bad
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_django_orm.py
View File

@@ -32,7 +32,7 @@ import unittest
# Ensure that if app engine is available, we use the correct django from it # Ensure that if app engine is available, we use the correct django from it
try: try:
from google.appengine.dist import use_library from google.appengine.dist import use_library
use_library('django', '1.2') use_library('django', '1.5')
except ImportError: except ImportError:
pass pass
@@ -41,7 +41,8 @@ from oauth2client.client import Flow
# Mock a Django environment # Mock a Django environment
os.environ['DJANGO_SETTINGS_MODULE'] = 'django_settings' 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 CredentialsField
from oauth2client.django_orm import FlowField from oauth2client.django_orm import FlowField

2
tox.ini
View File

@@ -6,7 +6,7 @@ deps = keyring
mox mox
pyopenssl pyopenssl
pycrypto==2.6 pycrypto==2.6
django==1.2 django>=1.5,<1.6
webtest webtest
nose nose
setenv = PYTHONPATH=../google_appengine setenv = PYTHONPATH=../google_appengine