Merge branch 'django-4'

Author: PeterJCLaw

.circleci/config.yml

@@ -34,15 +34,13 @@ references:
   version-matrix: &version-matrix
     matrix:
       parameters:
-        python-version: ["3.5.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
-        django-version: ["2.2", "3.0", "3.1", "3.2"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        django-version: ["2.2", "3.0", "3.1", "3.2", "4.0"]
       exclude:
-        - python-version: "3.5.5"
-          django-version: "3.0"
-        - python-version: "3.5.5"
-          django-version: "3.1"
-        - python-version: "3.5.5"
-          django-version: "3.2"
+        - python-version: "3.6"
+          django-version: "4.0"
+        - python-version: "3.7"
+          django-version: "4.0"
 
 executors:
   python:

debug_toolbar_user_switcher/panels.py

@@ -40,9 +40,9 @@
 from django import VERSION
 from django.conf import settings
 from django.http import HttpResponseForbidden
-from django.conf.urls import url
+from django.urls import re_path, path
 from django.template.loader import render_to_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django.contrib.auth import get_user_model
 
@@ -113,11 +113,11 @@ def process_request(self, request):
     @classmethod
     def get_urls(cls):
         return (
-            url(r"^users/login/$", views.login_form, name="debug-userpanel-login-form"),
-            url(
+            path("users/login/", views.login_form, name="debug-userpanel-login-form"),
+            re_path(
                 r"^users/login/(?P<pk>-?\d+)$",
                 views.login,
                 name="debug-userpanel-login",
             ),
-            url(r"^users/logout$", views.logout, name="debug-userpanel-logout"),
+            path("users/logout", views.logout, name="debug-userpanel-logout"),
         )

poetry.lock

@@ -10,9 +10,9 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.5"
-Django = "<4"
-django-debug-toolbar = "<4"
+python = "^3.6"
+django = ">=2.2,<5"
+django-debug-toolbar = ">=2,<4"
 
 [tool.poetry.dev-dependencies]