Merge pull request DjangoAdminHackers#28 from claudep/travis_config

Added Travis CI config

.travis.yml

@@ -0,0 +1,21 @@
+language: python
+python:
+  - 2.6
+  - 2.7
+env:
+  - DJANGO=django==1.6.11
+  - DJANGO=django==1.7.7
+  - DJANGO=django==1.8.2
+matrix:
+  exclude:
+    - python: 2.6
+      env: DJANGO=django==1.7.7
+    - python: 2.6
+      env: DJANGO=django==1.8.2
+  fast_finish: true
+install:
+  - travis_retry pip install $DJANGO
+  - pip install -e .
+script: python runtests.py
+notifications:
+  email: false

linkcheck/tests/test_linkcheck.py

@@ -180,7 +180,7 @@ def test_display_url(self):
         self.assertEqual(Link.objects.count(), 2)
         self.assertEqual(
             set([l.display_url for l in Link.objects.all()]),
-            {'http://www.example.org', 'http://www.example.org#john'}
+            set(['http://www.example.org', 'http://www.example.org#john'])
         )
 
     def test_report_view(self):

linkcheck/views.py

@@ -1,23 +1,19 @@
-from django.views.decorators.csrf import csrf_exempt
-
+import json
 from itertools import groupby
 from operator import itemgetter
 
-try:
-    import simplejson
-except:
-    from django.utils import simplejson
+from django import forms
+from django.conf import settings
 from django.contrib.admin.templatetags.admin_static import static
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.contenttypes.models import ContentType
 from django.core.paginator import Paginator
 from django.core.urlresolvers import reverse
+from django.db import models
 from django.http import HttpResponse
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-from django import forms
-from django.conf import settings
-from django.db import models
+from django.views.decorators.csrf import csrf_exempt
 
 from linkcheck.linkcheck_settings import RESULTS_PER_PAGE
 from linkcheck.models import Link
@@ -56,17 +52,17 @@ def report(request):
             link.ignore = True
             link.save()
             if request.is_ajax():
-                json = simplejson.dumps({'link': ignore_link_id})
-                return HttpResponse(json, content_type='application/javascript')
+                json_data = json.dumps({'link': ignore_link_id})
+                return HttpResponse(json_data, content_type='application/javascript')
 
         unignore_link_id = request.GET.get('unignore', None)
         if unignore_link_id != None:
             link = Link.objects.get(id=unignore_link_id)
             link.ignore = False
             link.save()
             if request.is_ajax():
-                json = simplejson.dumps({'link': unignore_link_id})
-                return HttpResponse(json, content_type='application/javascript')
+                json_data = json.dumps({'link': unignore_link_id})
+                return HttpResponse(json_data, content_type='application/javascript')
 
         recheck_link_id = request.GET.get('recheck', None)
         if recheck_link_id != None:
@@ -75,12 +71,12 @@ def report(request):
             url.check_url(external_recheck_interval=0)
             links = [x[0] for x in url.links.values_list('id')]
             if request.is_ajax():
-                json = simplejson.dumps({
+                json_data = json.dumps({
                     'links': links,
                     'message': url.message,
                     'colour': url.colour,
                 })
-                return HttpResponse(json, content_type='application/javascript')
+                return HttpResponse(json_data, content_type='application/javascript')
 
     link_filter = request.GET.get('filters', 'show_invalid')
 

runtests.py

@@ -5,32 +5,33 @@
 
 import django
 from django.conf import settings
-from django.test.runner import DiscoverRunner
 
 if not settings.configured:
-    settings.configure(
-        DATABASES={'default': {'ENGINE': 'django.db.backends.sqlite3'}},
-        STATIC_URL = '/static/',
-        INSTALLED_APPS=[
+    test_settings = {
+        'DATABASES': {'default': {'ENGINE': 'django.db.backends.sqlite3'}},
+        'STATIC_URL': '/static/',
+        'INSTALLED_APPS': [
             'django.contrib.admin', 'django.contrib.auth',
             'django.contrib.sessions', 'django.contrib.contenttypes',
             'linkcheck', 'linkcheck.tests.sampleapp',
         ],
-        ROOT_URLCONF = "linkcheck.tests.test_urls",
-        MIDDLEWARE_CLASSES=(
+        'ROOT_URLCONF': "linkcheck.tests.test_urls",
+        'SITE_DOMAIN': "localhost",
+    }
+    if django.get_version() >= '1.7':
+        test_settings['MIDDLEWARE_CLASSES'] = [
             'django.contrib.sessions.middleware.SessionMiddleware',
             'django.middleware.common.CommonMiddleware',
             'django.middleware.csrf.CsrfViewMiddleware',
             'django.contrib.auth.middleware.AuthenticationMiddleware',
             'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-        ),
-        SITE_DOMAIN = "localhost"
-    )
+        ]
+    settings.configure(**test_settings)
 
 
 def runtests(*test_args):
-    if not test_args:
-        test_args = ['linkcheck']
+    from django.test.runner import DiscoverRunner
+
     parent = dirname(abspath(__file__))
     sys.path.insert(0, parent)
     test_runner = DiscoverRunner(verbosity=1, interactive=True)
@@ -39,5 +40,6 @@ def runtests(*test_args):
 
 
 if __name__ == '__main__':
-    django.setup()
+    if django.get_version() >= '1.7':
+        django.setup()
     runtests(*sys.argv[1:])