Merge branch 'main' into shadowdom

Author: matthiask

.pre-commit-config.yaml

@@ -18,12 +18,12 @@ repos:
     rev: 1.30.0
     hooks:
     -   id: django-upgrade
-        args: [--target-version, "4.2"]
+        args: [--target-version, "5.2"]
 -   repo: https://github.com/adamchainz/djade-pre-commit
     rev: "1.9.0"
     hooks:
     -   id: djade
-        args: [--target-version, "4.2"]
+        args: [--target-version, "5.2"]
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:

README.rst

@@ -41,7 +41,7 @@ In addition to the built-in panels, a number of third-party panels are
 contributed by the community.
 
 The current stable version of the Debug Toolbar is 6.3.0. It works on
-Django ≥ 4.2.0.
+Django ≥ 5.2.0.
 
 The Debug Toolbar has experimental support for `Django's asynchronous views
 <https://docs.djangoproject.com/en/dev/topics/async/>`_. Please note that

debug_toolbar/static/debug_toolbar/js/utils.js

@@ -152,7 +152,7 @@ export function debounce(func, timeout) {
     let timer;
     return (...args) => {
         clearTimeout(timer);
-        timer = setTimeout(() => Promise.try(func, ...args), timeout);
+        timer = setTimeout(() => func(...args), timeout);
     };
 }
 

docs/changes.rst

@@ -8,6 +8,7 @@ Pending
   fetch requests.
 * Added a note to the prerequisites section of the installation docs
   about requiring an up-to-date browser.
+* Dropped support for Django 4.2 and Django 5.1 .
 * Updated to render the toolbar in a shadow DOM for better isolation
   from the rest of the page. This can be disabled with the setting
   ``USE_SHADOW_DOM``.

docs/contributing.rst

@@ -108,6 +108,15 @@ For MySQL/MariaDB in a ``mysql`` shell::
     mysql> GRANT ALL PRIVILEGES ON debug_toolbar.* TO 'debug_toolbar'@'localhost';
     mysql> GRANT ALL PRIVILEGES ON test_debug_toolbar.* TO 'debug_toolbar'@'localhost';
 
+The toolbar also ships a JavaScript test suite that runs in a real browser
+with `Vitest <https://vitest.dev/>`_ and
+`WebdriverIO <https://webdriver.io/>`_. It requires Node.js (see ``engines``
+in ``package.json`` for the supported version) and a local install of Chrome
+and Firefox. Install the JavaScript dependencies and run the tests with::
+
+    $ npm install
+    $ npm test
+
 
 Style
 -----

docs/installation.rst

@@ -71,7 +71,7 @@ Second, ensure that your ``TEMPLATES`` setting contains a
     ]
 
 Third, the Debug Toolbar requires an up to date browser and targets [Baseline
-Newly Available](https://web.dev/series/baseline-newly-available) to delivery
+Widely Available](https://web.dev/series/baseline-widely-available) to delivery
 modern debug tools. Should you need to test in an older browser, simply disable
 the toolbar for those sessions.
 

pyproject.toml

@@ -17,8 +17,6 @@ classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Environment :: Web Environment",
   "Framework :: Django",
-  "Framework :: Django :: 4.2",
-  "Framework :: Django :: 5.1",
   "Framework :: Django :: 5.2",
   "Framework :: Django :: 6.0",
   "Intended Audience :: Developers",
@@ -37,7 +35,7 @@ dynamic = [
   "version",
 ]
 dependencies = [
-  "django>=4.2.9",
+  "django>=5.2",
   "sqlparse>=0.2",
 ]
 urls.Changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html"

tests/panels/test_template.py

@@ -1,6 +1,5 @@
 from unittest import expectedFailure
 
-import django
 from django.contrib.auth.models import User
 from django.template import Context, RequestContext, Template
 from django.test import override_settings
@@ -56,10 +55,7 @@ def test_template_repr(self):
 
         User.objects.create(username="admin")
         bad_repr = TemplateReprForm()
-        if django.VERSION < (5,):
-            t = Template("<table>{{ bad_repr }}</table>")
-        else:
-            t = Template("{{ bad_repr }}")
+        t = Template("{{ bad_repr }}")
         c = Context({"bad_repr": bad_repr})
         html = t.render(c)
         self.assertIsNotNone(html)

tests/test_login_not_required.py

@@ -1,6 +1,3 @@
-import unittest
-
-import django
 from django.test import SimpleTestCase, override_settings
 from django.urls import reverse
 
@@ -9,10 +6,6 @@
 from tests.test_integration import toolbar_request_id
 
 
-@unittest.skipIf(
-    django.VERSION < (5, 1),
-    "Valid on Django 5.1 and above, requires LoginRequiredMiddleware",
-)
 @override_settings(
     DEBUG=True,
     MIDDLEWARE=[

tox.ini

@@ -3,16 +3,14 @@ isolated_build = true
 envlist =
     docs
     packaging
-    py{310,311}-dj{42,51,52}-{sqlite,postgresql,psycopg3,postgis,mysql}
-    py{312}-dj{42,51,52,60}-{sqlite,postgresql,psycopg3,postgis,mysql}
-    py{313}-dj{51,52,60,main}-{sqlite,psycopg3,postgis3,mysql}
+    py{310,311}-dj{52}-{sqlite,postgresql,psycopg3,postgis,mysql}
+    py{312}-dj{52,60}-{sqlite,postgresql,psycopg3,postgis,mysql}
+    py{313}-dj{52,60,main}-{sqlite,psycopg3,postgis3,mysql}
     py{314}-dj{52,60,main}-{sqlite,psycopg3,postgis3,mysql}
 
 [testenv]
 deps =
-    dj42: django~=4.2.1
-    dj51: django~=5.1.0
-    dj52: django~=5.2.0a1
+    dj52: django~=5.2.0
     dj60: django~=6.0
     djmain: https://github.com/django/django/archive/main.tar.gz
     postgresql: psycopg2-binary
@@ -48,28 +46,28 @@ dependency_groups =
 commands = python -b -W always -m coverage run -m django test -v2 {posargs:tests}
 
 
-[testenv:py{310,311,312,313,314}-dj{42,51,52,60,main}-{postgresql,psycopg3}]
+[testenv:py{310,311,312,313,314}-dj{52,60,main}-{postgresql,psycopg3}]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = postgresql
     DB_PORT = {env:DB_PORT:5432}
 
 
-[testenv:py{310,311,312,313,314}-dj{42,51,52,60,main}-{postgis,postgis3}]
+[testenv:py{310,311,312,313,314}-dj{52,60,main}-{postgis,postgis3}]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = postgis
     DB_PORT = {env:DB_PORT:5432}
 
 
-[testenv:py{310,311,312,313,314}-dj{42,51,52,60,main}-mysql]
+[testenv:py{310,311,312,313,314}-dj{52,60,main}-mysql]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = mysql
     DB_PORT = {env:DB_PORT:3306}
 
 
-[testenv:py{310,311,312,313,314}-dj{42,51,52,60,main}-sqlite]
+[testenv:py{310,311,312,313,314}-dj{52,60,main}-sqlite]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = sqlite3