Merge branch 'main' into patch-1

Author: tim-schilling

.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

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
     -   id: check-toml
     -   id: check-yaml
@@ -29,12 +29,12 @@ repos:
     -   id: rst-backticks
     -   id: rst-directive-colons
 -   repo: https://github.com/biomejs/pre-commit
-    rev: v2.1.2
+    rev: v2.1.4
     hooks:
       - id: biome-check
         verbose: true
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.12.4'
+    rev: 'v0.12.8'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

debug_toolbar/store.py

@@ -1,6 +1,5 @@
 import contextlib
 import json
-import logging
 from collections import defaultdict, deque
 from collections.abc import Iterable
 from typing import Any
@@ -13,15 +12,12 @@
 from debug_toolbar import settings as dt_settings
 from debug_toolbar.models import HistoryEntry
 
-logger = logging.getLogger(__name__)
-
 
 class DebugToolbarJSONEncoder(DjangoJSONEncoder):
     def default(self, o):
         try:
             return super().default(o)
         except (TypeError, ValueError):
-            logger.debug("The debug toolbar can't serialize %s into JSON" % o)
             return force_str(o)
 
 

docs/changes.rst

@@ -4,6 +4,8 @@ Change log
 Pending
 -------
 
+* Added a note about the default password in ``make example``.
+* Removed logging about the toolbar failing to serialize a value into JSON.
 * Moved the the import statement of ``debug_toolbar.urls`` to within the if
   statement's scope on the installation documentation.
 

docs/contributing.rst

@@ -40,6 +40,9 @@ For convenience, there's an alias for the second command::
 
     $ make example
 
+The default password is ``p``, it can be overridden by setting the environment
+variable ``DJANGO_SUPERUSER_PASSWORD``.
+
 Look at ``example/settings.py`` for running the example with another database
 than SQLite.
 

tests/test_store.py

@@ -14,6 +14,12 @@ def test_serialize(self):
             '{"hello": {"foo": "bar"}}',
         )
 
+    def test_serialize_logs_on_failure(self):
+        self.assertEqual(
+            store.serialize({"hello": {"foo": b"bar"}}),
+            '{"hello": {"foo": "bar"}}',
+        )
+
     def test_deserialize(self):
         self.assertEqual(
             store.deserialize('{"hello": {"foo": "bar"}}'),

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}