diff --git a/ietf/bibliography/wagtail_hooks.py b/ietf/bibliography/wagtail_hooks.py index 0111c594..2e32274f 100644 --- a/ietf/bibliography/wagtail_hooks.py +++ b/ietf/bibliography/wagtail_hooks.py @@ -1,4 +1,4 @@ -from django.core.urlresolvers import reverse +from django.urls import reverse from wagtail.core import hooks from wagtail.admin.menu import MenuItem diff --git a/ietf/settings/base.py b/ietf/settings/base.py index 282ec7d4..78a656d6 100644 --- a/ietf/settings/base.py +++ b/ietf/settings/base.py @@ -85,7 +85,6 @@ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', diff --git a/ietf/snippets/wagtail_hooks.py b/ietf/snippets/wagtail_hooks.py index 82db4037..f4974612 100644 --- a/ietf/snippets/wagtail_hooks.py +++ b/ietf/snippets/wagtail_hooks.py @@ -1,6 +1,6 @@ from django.conf.urls import include, url from django.contrib.staticfiles.templatetags.staticfiles import static -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils.html import format_html, format_html_join from wagtail.admin.menu import MenuItem diff --git a/ietf/urls.py b/ietf/urls.py index 53adfe07..6b33ea9b 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -14,7 +14,7 @@ urlpatterns = [ url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^bibliography/', include(bibliography_urls)), - url(r'^django-admin/', include(admin.site.urls)), + url(r'^django-admin/', admin.site.urls), url(r'^blog/feed/$', BlogFeed(), name='blog_feed'), url(r'^admin/', include(wagtailadmin_urls)), diff --git a/requirements.txt b/requirements.txt index 0d9b7ea7..39508cba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django>=1.11.19,<1.12 +Django>=2.2,<3 djangorestframework>=3.8 psycopg2>=2.7.5 wagtail==2.3