Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test config & settings updates #981

Merged
merged 3 commits into from
Jun 17, 2015
Merged

Test config & settings updates #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7edb7df
Added Django 1.8 to the travis build matrix
Jun 17, 2015
e8c6c08
Use the latest patch version of Django for each major release
Jun 17, 2015
536df4c
Added 1.8 specific TEMPLATES settings
Jun 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ env:
global:
- TEST_APPS="allauth account socialaccount amazon angellist bitbucket coinbase evernote feedly foursquare douban dropbox dropbox_oauth2 facebook flickr google github hubic instagram linkedin linkedin_oauth2 mailru odnoklassniki windowslive openid orcid paypal persona soundcloud spotify stackexchange tumblr twitch twitter vimeo vk weibo bitly xing"
matrix:
- DJANGO=Django==1.5
- DJANGO=Django==1.6
- DJANGO=Django==1.7
- DJANGO="Django<1.6"
- DJANGO="Django<1.7"
- DJANGO="Django<1.8"
- DJANGO="Django<1.9"
install:
- pip install $DJANGO --use-mirrors
- pip install . --use-mirrors
Expand All @@ -24,7 +25,9 @@ script: if [ -o $DJANGO == Django==1.5 ]; then coverage run manage.py test $TEST
matrix:
exclude:
- python: "2.6"
env: DJANGO=Django==1.7
env: DJANGO="Django<1.8"
- python: "2.6"
env: DJANGO="Django<1.9"
after_success:
- coverage report
- pip install --quiet python-coveralls
Expand Down
46 changes: 34 additions & 12 deletions test_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-

import django

SECRET_KEY = 'psst'
SITE_ID = 1

Expand All @@ -16,18 +18,38 @@

ROOT_URLCONF = 'allauth.urls'

TEMPLATE_CONTEXT_PROCESSORS = (
"django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
"django.core.context_processors.static",
"django.core.context_processors.request",
"django.contrib.messages.context_processors.messages",

"allauth.account.context_processors.account",
"allauth.socialaccount.context_processors.socialaccount",
)
if django.VERSION >= (1, 8):
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'django.core.context_processors.request',
'allauth.account.context_processors.account',
'allauth.socialaccount.context_processors.socialaccount',
],
},
},
]
else:
TEMPLATE_CONTEXT_PROCESSORS = (
"django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
"django.core.context_processors.static",
"django.core.context_processors.request",
"django.contrib.messages.context_processors.messages",

"allauth.account.context_processors.account",
"allauth.socialaccount.context_processors.socialaccount",
)

MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
Expand Down