Updated Django versions to test against. Removed Django 1.5 since its no longer supported by Django itself. Some Django 1.7 improvements.

.travis.yml

@@ -5,16 +5,16 @@ python:
   - 3.3
 
 env:
-  - DJANGO=1.4.13
-  - DJANGO=1.5.8
-  - DJANGO=1.6.5
+  - DJANGO=1.4.16
+  - DJANGO=1.6.8
+  - DJANGO=1.7.1
 
 matrix:
   exclude:
     - python: 3.3
-      env: DJANGO=1.4.13
+      env: DJANGO=1.4.16
     - python: 3.3
-      env: DJANGO=1.5.8
+      env: DJANGO=1.6.8
 
 branches:
   only:

requirements.txt

@@ -5,7 +5,7 @@
 # -----------------------------------------------------------------------------
 
 # Project dependencies
-django==1.6.5
+django==1.7.1
 django-mptt==0.6.0
 pygments==1.6
 requests==2.0.0
@@ -22,4 +22,4 @@ sphinx_rtd_theme
 django-redis==3.3
 gunicorn==18.0
 south==0.8.2
-newrelic
+

runtests.py

@@ -16,6 +16,9 @@ if not settings.configured:
             'mptt',
             'dpaste',
         ],
+        MIDDLEWARE_CLASSES = (
+            'django.contrib.sessions.middleware.SessionMiddleware',
+        ),
         STATIC_ROOT='/tmp/dpaste_test_static/',
         STATIC_URL='/static/',
         ROOT_URLCONF='dpaste.urls',
@@ -23,10 +26,14 @@ if not settings.configured:
 
 def runtests(*test_args):
     from django.test.simple import DjangoTestSuiteRunner
-    from django import VERSION
-    if VERSION[0] >= 1 and VERSION[1] >= 7:
+
+    # New Django 1.7 app registry
+    try:
         from django import setup
-        setup() # New Django 1.7 app registry
+        setup()
+    except ImportError:
+        pass
+
     test_runner = DjangoTestSuiteRunner(verbosity=1)
     failures = test_runner.run_tests(['dpaste', ])
     if failures:

tox.ini

@@ -2,26 +2,22 @@
 toxworkdir=/tmp/tox/dpaste
 envlist=
     py27-django-1.4,
-    py27-django-1.5,
     py27-django-1.6,
-    py27-django-1.7a,
-    py33-django-1.6,
+    py27-django-1.7,
+    py33-django-1.7,
 
 [testenv]
 commands=
     python runtests.py
 
 [testenv:py27-django-1.4]
-deps=django==1.4.13
-
-[testenv:py27-django-1.5]
-deps=django==1.5.8
+deps=django==1.4.16
 
 [testenv:py27-django-1.6]
-deps=django==1.6.5
+deps=django==1.6.8
 
-[testenv:py33-django-1.6]
-deps=django==1.6.5
+[testenv:py27-django-1.7]
+deps=django==1.7.1
 
-[testenv:py27-django-1.7a]
-deps=https://www.djangoproject.com/download/1.7a2/tarball/
+[testenv:py33-django-1.7]
+deps=django==1.7.1