Merge branch 'grahamu-remove-patterns-import' into v0.3.x

oidc_provider/tests/app/settings.py

@@ -19,6 +19,22 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 ]
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,

oidc_provider/tests/app/urls.py

@@ -1,10 +1,10 @@
 from django.contrib.auth import views as auth_views
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.generic import TemplateView
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'),
     url(r'^accounts/login/$', auth_views.login, {'template_name': 'accounts/login.html'}, name='login'),
     url(r'^accounts/logout/$', auth_views.logout, {'template_name': 'accounts/logout.html'}, name='logout'),
@@ -12,4 +12,4 @@ urlpatterns = patterns('',
     url(r'^openid/', include('oidc_provider.urls', namespace='oidc_provider')),
 
     url(r'^admin/', include(admin.site.urls)),
-)
+]

oidc_provider/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.views.decorators.csrf import csrf_exempt
 from oidc_provider.views import *
 

setup.py

@@ -36,7 +36,7 @@ setup(
     ],
     tests_require=[
         'pyjwkest==1.1.0',
-        'mock==1.3.0',
+        'mock==2.0.0',
     ],
 
     install_requires=[

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 
 envlist=
-    clean,py{27,34}-django{17,18,19},py35-django{18,19},stats
+    clean,py{27,34}-django{17,18,19,110},py35-django{18,19,110},stats
 
 [testenv]
 
@@ -9,6 +9,7 @@ deps =
     django17: django>=1.7,<1.8
     django18: django>=1.8,<1.9
     django19: django>=1.9,<1.10
+    django110: django>=1.10,<1.11
     coverage
     mock