Hopiu/django-avatar
1
0
Fork 0
mirror of https://github.com/jazzband/django-avatar.git synced 2026-03-16 22:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use MIDDLEWARE setting

Browse source
This commit is contained in:
Grant McConnaughey 2017-12-17 11:22:56 -06:00
parent b6c9ff1d03
commit 6d4a1b27d1
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/requirements.txt
View file

@ -1,3 +1,2 @@
flake8
coverage==4.2
django-discover-runner
coverage==4.2

38
tests/settings.py
View file

@ -1,7 +1,5 @@
import os
import django
VERSION = django.VERSION
SETTINGS_DIR = os.path.dirname(__file__)
DATABASE_ENGINE = 'sqlite3'
@ -21,6 +19,7 @@ INSTALLED_APPS = [
'avatar',
]
# Django 1.9
MIDDLEWARE_CLASSES = (
"django.middleware.common.CommonMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
@ -29,20 +28,24 @@ MIDDLEWARE_CLASSES = (
"django.contrib.messages.middleware.MessageMiddleware",
)
if VERSION[0] == 1 and VERSION[1] < 8:
TEMPLATE_DIRS = (
os.path.join(SETTINGS_DIR, 'templates'),
)
else:
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
'DIRS': [
os.path.join(SETTINGS_DIR, 'templates')
]
}
]
# Django 1.10+
MIDDLEWARE = (
"django.middleware.common.CommonMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
)
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
'DIRS': [
os.path.join(SETTINGS_DIR, 'templates')
]
}
]
ROOT_URLCONF = 'tests.urls'
@ -50,9 +53,6 @@ SITE_ID = 1
SECRET_KEY = 'something-something'
if django.VERSION[:2] < (1, 6):
TEST_RUNNER = 'discover_runner.DiscoverRunner'
ROOT_URLCONF = 'tests.urls'
STATIC_URL = '/site_media/static/'