Fix tests with Django master (2.0)

.travis.yml

@@ -4,12 +4,10 @@ env:
     - TOXENV=py27-django-18
     - TOXENV=py27-django-19
     - TOXENV=py27-django-110
-    - TOXENV=py27-django-master
     - TOXENV=py33-django-18
     - TOXENV=py34-django-18
     - TOXENV=py34-django-19
     - TOXENV=py34-django-110
-    - TOXENV=py34-django-master
   global:
     - PIP_WHEEL_DIR=$HOME/.wheels
     - PIP_FIND_LINKS=file://$HOME/.wheels

formtools/wizard/views.py

@@ -2,7 +2,6 @@ import re
 from collections import OrderedDict
 
 from django import forms
-from django.core.urlresolvers import reverse
 from django.forms import ValidationError, formsets
 from django.shortcuts import redirect
 from django.utils import six
@@ -14,6 +13,11 @@ from .forms import ManagementForm
 from .storage import get_storage
 from .storage.exceptions import NoFileStorageConfigured
 
+try:
+    from django.urls import reverse
+except ImportError:  # Django 1.9 and earlier
+    from django.core.urlresolvers import reverse
+
 
 def normalize_name(name):
     """

tests/settings.py

@@ -24,6 +24,13 @@ CACHES = {
     }
 }
 
+MIDDLEWARE = [
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+]
+
+# Django 1.9 and earlier
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',

tests/wizard/namedwizardtests/tests.py

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 import copy
 
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from django.http import QueryDict
 from django.test import TestCase, override_settings
 from django.utils._os import upath
@@ -15,6 +14,11 @@ from formtools.wizard.views import (
 from ..test_forms import Step1, Step2, get_request
 from .forms import temp_storage
 
+try:
+    from django.urls import reverse
+except ImportError:  # Django 1.9 and earlier
+    from django.core.urlresolvers import reverse
+
 # On Python 2, __file__ may end with .pyc
 THIS_FILE = upath(__file__).rstrip("c")
 UPLOADED_FILE_NAME = 'tests.py'

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 args_are_paths = false
 envlist =
-    {py27,py34}-django-{18,19,110,master}
+    {py27,py34}-django-{18,19,110}
     py33-django-{18}
     py35-django-{18,19,110,master}