Merge branch 'main' into fix-database-store-panel-keyerror

Author: abdibaker

.github/workflows/test.yml

@@ -88,6 +88,10 @@ jobs:
               database: psycopg3
             - python-version: '3.13'
               database: postgis3
+            - python-version: '3.13'
+              database: postgresql
+              env:
+                DJANGO_SELENIUM_TESTS=true
 
     services:
       postgres:
@@ -143,6 +147,7 @@ jobs:
         DB_BACKEND: ${{ matrix.database }}
         DB_HOST: localhost
         DB_PORT: 5432
+        DJANGO_SELENIUM_TESTS: ${{ matrix.env.DJANGO_SELENIUM_TESTS }}
 
   sqlite:
     runs-on: ubuntu-latest

docs/changes.rst

@@ -9,6 +9,8 @@ Pending
 * Fixed KeyError when using DatabaseStore with dynamically added panels to
   DEBUG_TOOLBAR_PANELS. Also fixed history sidebar to only include enabled
   panels.
+* Moved the the import statement of ``debug_toolbar.urls`` to within the if
+  statement's scope on the installation documentation.
 
 6.0.0 (2025-07-22)
 ------------------

docs/installation.rst

@@ -183,9 +183,10 @@ You should also modify your URLconf file:
 .. code-block:: python
 
     from django.conf import settings
-    from debug_toolbar.toolbar import debug_toolbar_urls
 
     if not settings.TESTING:
+        from debug_toolbar.toolbar import debug_toolbar_urls
+
         urlpatterns = [
             *urlpatterns,
         ] + debug_toolbar_urls()

tox.ini

@@ -42,7 +42,6 @@ passenv=
 setenv =
     PYTHONPATH = {toxinidir}
     PYTHONWARNINGS = d
-    py311-dj42-postgresql: DJANGO_SELENIUM_TESTS = {env:DJANGO_SELENIUM_TESTS:true}
     DB_NAME = {env:DB_NAME:debug_toolbar}
     DB_USER = {env:DB_USER:debug_toolbar}
     DB_HOST = {env:DB_HOST:localhost}