django 1.7 compatibility, tox, travis

@@ -7,5 +7,14 @@ python:
 env:
 env:
     - DJANGO_PACKAGE="Django>=1.5,<1.6"
     - DJANGO_PACKAGE="Django>=1.5,<1.6"
     - DJANGO_PACKAGE="Django>=1.6,<1.7"
     - DJANGO_PACKAGE="Django>=1.6,<1.7"
-install: pip install $DJANGO_PACKAGE --use-mirrors
+    - DJANGO_PACKAGE="Django>=1.7,<1.8"
+
+matrix:
+  exclude:
+  - python: "2.6"
+    env: DJANGO_PACKAGE="Django>=1.7,<1.8"
+
+install:
+    - pip install $DJANGO_PACKAGE --use-mirrors
+    - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install --use-mirrors unittest2; fi
 script: python setup.py test
 script: python setup.py test

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sites', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('contenttypes', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Comment',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('object_pk', models.TextField(verbose_name='object ID')),
+                ('user_name', models.CharField(max_length=50, verbose_name="user's name", blank=True)),
+                ('user_email', models.EmailField(max_length=75, verbose_name="user's email address", blank=True)),
+                ('user_url', models.URLField(verbose_name="user's URL", blank=True)),
+                ('comment', models.TextField(max_length=3000, verbose_name='comment')),
+                ('submit_date', models.DateTimeField(default=None, verbose_name='date/time submitted')),
+                ('ip_address', models.GenericIPAddressField(unpack_ipv4=True, null=True, verbose_name='IP address', blank=True)),
+                ('is_public', models.BooleanField(default=True, help_text='Uncheck this box to make the comment effectively disappear from the site.', verbose_name='is public')),
+                ('is_removed', models.BooleanField(default=False, help_text='Check this box if the comment is inappropriate. A "This comment has been removed" message will be displayed instead.', verbose_name='is removed')),
+                ('content_type', models.ForeignKey(related_name='content_type_set_for_comment', verbose_name='content type', to='contenttypes.ContentType')),
+                ('site', models.ForeignKey(to='sites.Site')),
+                ('user', models.ForeignKey(related_name='comment_comments', verbose_name='user', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+            ],
+            options={
+                'ordering': ('submit_date',),
+                'db_table': 'django_comments',
+                'verbose_name': 'comment',
+                'verbose_name_plural': 'comments',
+                'permissions': [('can_moderate', 'Can moderate comments')],
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='CommentFlag',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('flag', models.CharField(max_length=30, verbose_name='flag', db_index=True)),
+                ('flag_date', models.DateTimeField(default=None, verbose_name='date')),
+                ('comment', models.ForeignKey(related_name='flags', verbose_name='comment', to='django_comments.Comment')),
+                ('user', models.ForeignKey(related_name='comment_flags', verbose_name='user', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'db_table': 'django_comment_flags',
+                'verbose_name': 'comment flag',
+                'verbose_name_plural': 'comment flags',
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AlterUniqueTogether(
+            name='commentflag',
+            unique_together=set([('user', 'comment', 'flag')]),
+        ),
+    ]

@@ -10,7 +10,7 @@ except IOError:
 
 
 setup(
 setup(
     name='django-contrib-comments',
     name='django-contrib-comments',
-    version='1.5',
+    version='1.5.1',
     url="http://github.com/django/django-contrib-comments",
     url="http://github.com/django/django-contrib-comments",
     description='The code formerly known as django.contrib.comments.',
     description='The code formerly known as django.contrib.comments.',
     long_description=long_description,
     long_description=long_description,

@@ -6,6 +6,7 @@ Adapted from django-constance, which itself was adapted from django-adminfiles.
 
 
 import os
 import os
 import sys
 import sys
+import django
 
 
 here = os.path.dirname(os.path.abspath(__file__))
 here = os.path.dirname(os.path.abspath(__file__))
 parent = os.path.dirname(here)
 parent = os.path.dirname(here)
@@ -24,6 +25,11 @@ settings.configure(
         "testapp",
         "testapp",
         "custom_comments",
         "custom_comments",
     ],
     ],
+    MIDDLEWARE_CLASSES=(
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+    ),
     ROOT_URLCONF = 'testapp.urls',
     ROOT_URLCONF = 'testapp.urls',
     SECRET_KEY = "it's a secret to everyone",
     SECRET_KEY = "it's a secret to everyone",
     SITE_ID = 1,
     SITE_ID = 1,
@@ -32,6 +38,8 @@ settings.configure(
 from django.test.simple import DjangoTestSuiteRunner
 from django.test.simple import DjangoTestSuiteRunner
 
 
 def main():
 def main():
+    if django.VERSION >= (1, 7):
+        django.setup()
     runner = DjangoTestSuiteRunner(failfast=True, verbosity=1)
     runner = DjangoTestSuiteRunner(failfast=True, verbosity=1)
     failures = runner.run_tests(['testapp'], interactive=True)
     failures = runner.run_tests(['testapp'], interactive=True)
     sys.exit(failures)
     sys.exit(failures)

@@ -30,7 +30,7 @@ class Entry(models.Model):
     title = models.CharField(max_length=250)
     title = models.CharField(max_length=250)
     body = models.TextField()
     body = models.TextField()
     pub_date = models.DateField()
     pub_date = models.DateField()
-    enable_comments = models.BooleanField()
+    enable_comments = models.BooleanField(default=False)
 
 
     def __str__(self):
     def __str__(self):
         return self.title
         return self.title

 from __future__ import absolute_import
 from __future__ import absolute_import
 
 
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
+
+import django
 from django.conf import settings
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.core.exceptions import ImproperlyConfigured
 from django.test.utils import override_settings
 from django.test.utils import override_settings
@@ -18,6 +25,7 @@ class CommentAppAPITests(CommentTestCase):
     def testGetCommentApp(self):
     def testGetCommentApp(self):
         self.assertEqual(django_comments.get_comment_app(), django_comments)
         self.assertEqual(django_comments.get_comment_app(), django_comments)
 
 
+    @unittest.skipIf(django.VERSION >= (1, 7), "Missing apps raise ImportError with django 1.7")
     @override_settings(
     @override_settings(
         COMMENTS_APP='missing_app',
         COMMENTS_APP='missing_app',
         INSTALLED_APPS=list(settings.INSTALLED_APPS) + ['missing_app'],
         INSTALLED_APPS=list(settings.INSTALLED_APPS) + ['missing_app'],
@@ -47,8 +55,6 @@ class CommentAppAPITests(CommentTestCase):
 
 
 @override_settings(
 @override_settings(
     COMMENTS_APP='custom_comments',
     COMMENTS_APP='custom_comments',
-    INSTALLED_APPS=list(settings.INSTALLED_APPS) + [
-        'custom_comments'],
 )
 )
 class CustomCommentTest(CommentTestCase):
 class CustomCommentTest(CommentTestCase):
     urls = 'testapp.urls'
     urls = 'testapp.urls'

 [tox]
 [tox]
 envlist = py26-django15, py27-django15, py32-django15, py33-django15,
 envlist = py26-django15, py27-django15, py32-django15, py33-django15,
-          py26-django16, py27-django16, py32-django16, py33-django16
+          py26-django16, py27-django16, py32-django16, py33-django16,
+          py27-django17, py32-django17, py33-django17
 
 
 [testenv]
 [testenv]
 commands = {envpython} setup.py test
 commands = {envpython} setup.py test
 
 
 [testenv:py26-django15]
 [testenv:py26-django15]
 basepython = python2.6
 basepython = python2.6
-deps = Django>=1.5,<1.6
+deps =
+    Django>=1.5,<1.6
+    unittest2
 
 
 [testenv:py27-django15]
 [testenv:py27-django15]
 basepython = python2.7
 basepython = python2.7
@@ -23,7 +26,9 @@ deps = Django>=1.5,<1.6
 
 
 [testenv:py26-django16]
 [testenv:py26-django16]
 basepython = python2.6
 basepython = python2.6
-deps = Django>=1.6,<1.7
+deps =
+    Django>=1.6,<1.7
+    unittest2
 
 
 [testenv:py27-django16]
 [testenv:py27-django16]
 basepython = python2.7
 basepython = python2.7
@@ -37,3 +42,14 @@ deps = Django>=1.6,<1.7
 basepython = python3.3
 basepython = python3.3
 deps = Django>=1.6,<1.7
 deps = Django>=1.6,<1.7
 
 
+[testenv:py27-django17]
+basepython = python2.7
+deps = Django>=1.7,<1.8
+
+[testenv:py32-django17]
+basepython = python3.2
+deps = Django>=1.7,<1.8
+
+[testenv:py33-django17]
+basepython = python3.3
+deps = Django>=1.7,<1.8