From a0980cf696295d6c79e941387b193a268a15be6f Mon Sep 17 00:00:00 2001 From: Bertrand Bordage Date: Thu, 21 Jul 2016 10:57:06 +0200 Subject: [PATCH] Tests Django 1.10. --- docs/quickstart.rst | 4 ++-- requirements.txt | 2 +- settings.py | 9 +++++++++ tox.ini | 5 +++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/docs/quickstart.rst b/docs/quickstart.rst index f17a68c..d32febb 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -4,8 +4,8 @@ Quick start Requirements ............ -- Django 1.7, 1.8, or 1.9 -- Python 2.7, 3.2, 3.3, 3.4, or 3.5 +- Django 1.8, 1.9 or 1.10 +- Python 2.7, 3.3, 3.4, or 3.5 - a cache configured as ``'default'`` with one of these backends: - `django-redis `_ diff --git a/requirements.txt b/requirements.txt index e38f742..531dd9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -Django>=1.7 +Django>=1.8 diff --git a/settings.py b/settings.py index c25b546..563f6d7 100644 --- a/settings.py +++ b/settings.py @@ -102,6 +102,15 @@ MIGRATION_MODULES = { } +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + }, +] + + MIDDLEWARE_CLASSES = () PASSWORD_HASHERS = ('django.contrib.auth.hashers.MD5PasswordHasher',) SECRET_KEY = 'it’s not important but we have to set it' diff --git a/tox.ini b/tox.ini index 973c0d4..1cce9b8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = - py{2.7,3.3,3.4,3.5}-django1.8-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, - py{2.7,3.4,3.5}-django1.9-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, + py3.3-django1.8-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, + py{2.7,3.4,3.5}-django{1.8,1.9,1.10}-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, [testenv] basepython = @@ -12,6 +12,7 @@ basepython = deps = django1.8: Django>=1.8,<1.9 django1.9: Django>=1.9,<1.10 + django1.10: Django==1.10rc1 psycopg2 django-redis python-memcached