diff --git a/.travis.yml b/.travis.yml index 7deac6d..e52c934 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,10 @@ env: - DJANGO="Django==1.5" - DJANGO="Django==1.5.7" - DJANGO="Django==1.6.4" - - DJANGO="https://www.djangoproject.com/m/releases/1.7/Django-1.7b1.tar.gz#egg=django" + - DJANGO="Django==1.7.11" matrix: exclude: # Python 2.6 support has been dropped in Django 1.7 - python: "2.6" - env: DJANGO="https://www.djangoproject.com/m/releases/1.7/Django-1.7b1.tar.gz#egg=django" \ No newline at end of file + env: DJANGO="Django==1.7.11" diff --git a/tos/models.py b/tos/models.py index f390fef..17773eb 100644 --- a/tos/models.py +++ b/tos/models.py @@ -1,7 +1,6 @@ from django.core.exceptions import ValidationError from django.db import models from django.utils.translation import ugettext_lazy as _ -from django.conf import settings # Django 1.4 compatability try: @@ -35,7 +34,8 @@ class TermsOfServiceManager(models.Manager): class TermsOfService(BaseModel): - active = models.BooleanField(verbose_name=_('active'), + active = models.BooleanField(default=False, + verbose_name=_('active'), help_text=_(u'Only one terms of service is allowed to be active')) content = models.TextField(verbose_name=_('content'), blank=True) objects = TermsOfServiceManager() diff --git a/tos/tests/test_settings.py b/tos/tests/test_settings.py index 9be6ac8..770a032 100644 --- a/tos/tests/test_settings.py +++ b/tos/tests/test_settings.py @@ -60,3 +60,5 @@ import django if hasattr(django, 'setup'): django.setup() +if django.VERSION > (1, 6): + TEST_RUNNER = 'django.test.runner.DiscoverRunner'