Skip to content

Commit

Permalink
Merge pull request #37 from sherzberg/1.7-support
Browse files Browse the repository at this point in the history
django 1.7 support; tox setup
  • Loading branch information
paltman committed Sep 16, 2014
2 parents 6782099 + b6ebee8 commit 51444fa
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion notification/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class NoticeSetting(models.Model):
user = models.ForeignKey(AUTH_USER_MODEL, verbose_name=_("user"))
notice_type = models.ForeignKey(NoticeType, verbose_name=_("notice type"))
medium = models.CharField(_("medium"), max_length=1, choices=NOTICE_MEDIA)
send = models.BooleanField(_("send"))
send = models.BooleanField(_("send"), default=False)

class Meta:
verbose_name = _("notice setting")
Expand Down
8 changes: 8 additions & 0 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@


DEFAULT_SETTINGS = dict(
MIDDLEWARE_CLASSES=(
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
),
INSTALLED_APPS=[
"django.contrib.auth",
"django.contrib.contenttypes",
Expand Down
8 changes: 7 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27-django14,py27-django15,py27-django16
envlist = py27-django14,py27-django15,py27-django16,py27-django17

[testenv]
downloadcache = {toxworkdir}/cache/
Expand All @@ -24,3 +24,9 @@ basepython = python2.7
deps =
Django==1.6.5
{[testenv]deps}

[testenv:py27-django17]
basepython = python2.7
deps =
https://github.com/django/django/archive/1.7c3.zip
{[testenv]deps}

0 comments on commit 51444fa

Please # to comment.