Skip to content

Commit

Permalink
Drop Django 1.6, add support for Django 1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
kaleissin committed Sep 12, 2016
1 parent 9c939e9 commit 9b7e49f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -12,4 +12,5 @@ script:
env:
- DJANGO="Django>=1.8,<1.9"
- DJANGO="Django>=1.9,<1.10"
- DJANGO="Django>=1.10,<1.11"
sudo: false
2 changes: 1 addition & 1 deletion requirements/base.txt
@@ -1 +1 @@
Django>=1.6,<1.10
Django>=1.8,<1.11
9 changes: 9 additions & 0 deletions src/mailer/settings/test.py
Expand Up @@ -17,3 +17,12 @@
# To shut up a warning in Django 1.7
MIDDLEWARE_CLASSES=()

TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': False,
'OPTIONS': {
'debug': DEBUG,
},
},
]
15 changes: 4 additions & 11 deletions tox.ini
@@ -1,14 +1,8 @@
[tox]
envlist =
py27-django16,
py33-django16,
py34-django16,
py27-django18,
py34-django18,
py35-django18,
py27-django19,
py34-django19,
py35-django19,
py{27,34,35}-django18,
py{27,34,35}-django19,
py{27,34,35}-django110,

[testenv]
setenv =
Expand All @@ -17,7 +11,6 @@ commands =
python runtests.py
whitelist_externals = make
deps =
django16: django>1.5,<1.7
django17: django>1.6,<1.8
django18: django>1.7,<1.9
django19: django>1.8,<1.10
django110: django>1.9,<1.11

0 comments on commit 9b7e49f

Please sign in to comment.