Skip to content

Commit ada3993

Browse files
authored
Merge branch 'main' into communitypanel
2 parents 66fd160 + 4f8be05 commit ada3993

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
- python-version: '3.13'
9090
database: postgis3
9191
- python-version: '3.13'
92-
database: postgresql
92+
database: psycopg3
9393
env:
9494
DJANGO_SELENIUM_TESTS=true
9595

debug_toolbar/toolbar.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,8 @@ def from_store(cls, request_id, panel_id=None):
221221
if panel_id and panel.panel_id != panel_id:
222222
continue
223223
data = toolbar.store.panel(toolbar.request_id, panel.panel_id)
224-
if data:
225-
panel.load_stats_from_store(data)
226-
toolbar._panels[panel.panel_id] = panel
224+
panel.load_stats_from_store(data)
225+
toolbar._panels[panel.panel_id] = panel
227226
return toolbar
228227

229228

docs/changes.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ Pending
88
* Removed logging about the toolbar failing to serialize a value into JSON.
99
* Moved the the import statement of ``debug_toolbar.urls`` to within the if
1010
statement's scope on the installation documentation.
11+
* Changed ``StoredDebugToolbar.from_store`` to always create a panel key and
12+
class instance, regardless if any data was generated.
13+
* Fixed selenium tests for CI by using psycopg for Python 3.13 runs.
1114
* Added ``Community Panel`` containing links to documentation and resources.
1215

1316
6.0.0 (2025-07-22)

tests/panels/test_history.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from django.urls import resolve, reverse
66

77
from debug_toolbar.panels.history import HistoryPanel
8+
from debug_toolbar.panels.redirects import RedirectsPanel
89
from debug_toolbar.store import get_store
910
from debug_toolbar.toolbar import DebugToolbar
1011

@@ -81,6 +82,7 @@ class HistoryViewsTestCase(IntegrationTestCase):
8182
"CachePanel",
8283
"SignalsPanel",
8384
"CommunityPanel",
85+
"ProfilingPanel",
8486
}
8587

8688
def test_history_panel_integration_content(self):
@@ -139,6 +141,7 @@ def test_history_sidebar_includes_history(self):
139141
self.client.get("/json_view/")
140142
panel_keys = copy.copy(self.PANEL_KEYS)
141143
panel_keys.add(HistoryPanel.panel_id)
144+
panel_keys.add(RedirectsPanel.panel_id)
142145
request_id = list(get_store().request_ids())[0]
143146
data = {"request_id": request_id}
144147
response = self.client.get(reverse("djdt:history_sidebar"), data=data)

0 commit comments

Comments
 (0)