From 0169aabef0d8b8d22300675a9cab1c0ff71d618b Mon Sep 17 00:00:00 2001 From: Arthur Date: Mon, 21 Apr 2025 10:00:43 -0700 Subject: [PATCH 1/2] 19217 update and re-add django-debug-toolbar to INSTALLED_APPS --- base_requirements.txt | 2 +- netbox/netbox/settings.py | 2 -- requirements.txt | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/base_requirements.txt b/base_requirements.txt index 3490f38742f..be44944e330 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -11,7 +11,7 @@ django-cors-headers # See: https://django-debug-toolbar.readthedocs.io/en/latest/changes.html#id1 # "Wrap SHOW_TOOLBAR_CALLBACK function with sync_to_async or async_to_sync to allow sync/async # compatibility." breaks stawberry-graphql-django at version 0.52.0 (current) -django-debug-toolbar==5.0.1 +django-debug-toolbar # Library for writing reusable URL query filters # https://github.com/carltongibson/django-filter/blob/main/CHANGES.rst diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 0248fa8882b..3f89fdb92fb 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -419,8 +419,6 @@ def _setting(name, default=None): 'drf_spectacular', 'drf_spectacular_sidecar', ] -if not DEBUG: - INSTALLED_APPS.remove('debug_toolbar') # Middleware MIDDLEWARE = [ diff --git a/requirements.txt b/requirements.txt index 1fa4c0fc09d..750bcf1db6a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Django==5.1.8 django-cors-headers==4.7.0 -django-debug-toolbar==5.0.1 +django-debug-toolbar==5.1.0 django-filter==25.1 django-htmx==1.23.0 django-graphiql-debug-toolbar==0.2.0 From b987b725d3a51935449b35ff1326652a429f1c65 Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 23 Apr 2025 08:50:16 -0700 Subject: [PATCH 2/2] 19217 remove debug if not collectstatic --- netbox/netbox/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 3f89fdb92fb..dbbac6ec491 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -419,6 +419,8 @@ def _setting(name, default=None): 'drf_spectacular', 'drf_spectacular_sidecar', ] +if not DEBUG and 'collectstatic' not in sys.argv: + INSTALLED_APPS.remove('debug_toolbar') # Middleware MIDDLEWARE = [