From fc1499a9b629ba78ed0b047b73becd05c860f5cc Mon Sep 17 00:00:00 2001 From: SilviaAmAm Date: Fri, 9 Feb 2024 12:17:42 +0100 Subject: [PATCH 1/2] :heavy_minus_sign: [#3049] Remove ddt-api-calls We don't actively use it (we don't have many server-side rendered pages making API calls) and it breaks on Django 4.2. Because of its limited use, it makes more sense to not invest any more effort. --- requirements/dev.in | 1 - requirements/dev.txt | 5 ----- src/openforms/conf/dev.py | 19 +------------------ 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index 6e37e71147..f8d7b41655 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -10,6 +10,5 @@ django-rosetta # Debug tooling django-debug-toolbar -ddt-api-calls django-extensions django-silk diff --git a/requirements/dev.txt b/requirements/dev.txt index 3d64aab182..e5e532741f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -184,8 +184,6 @@ cssselect2==0.7.0 # -c requirements/ci.txt # -r requirements/ci.txt # weasyprint -ddt-api-calls==0.3.2 - # via -r requirements/dev.in defusedxml==0.7.1 # via # -c requirements/ci.txt @@ -197,7 +195,6 @@ django==3.2.24 # via # -c requirements/ci.txt # -r requirements/ci.txt - # ddt-api-calls # django-admin-index # django-appconf # django-axes @@ -939,7 +936,6 @@ requests==2.31.0 # -c requirements/ci.txt # -r requirements/ci.txt # ape-pie - # ddt-api-calls # django-camunda # django-log-outgoing-requests # django-rosetta @@ -966,7 +962,6 @@ requests-mock==1.8.0 # via # -c requirements/ci.txt # -r requirements/ci.txt - # ddt-api-calls # zgw-consumers requests-oauthlib==1.3.0 # via diff --git a/src/openforms/conf/dev.py b/src/openforms/conf/dev.py index f5b26113df..74d6d4d6a3 100644 --- a/src/openforms/conf/dev.py +++ b/src/openforms/conf/dev.py @@ -99,26 +99,9 @@ ELASTIC_APM["DEBUG"] = config("DISABLE_APM_IN_DEV", default=True) # Django debug toolbar -INSTALLED_APPS += ["debug_toolbar", "ddt_api_calls"] +INSTALLED_APPS += ["debug_toolbar"] MIDDLEWARE = ["debug_toolbar.middleware.DebugToolbarMiddleware"] + MIDDLEWARE INTERNAL_IPS = ("127.0.0.1",) -DEBUG_TOOLBAR_CONFIG = {"INTERCEPT_REDIRECTS": False} -DEBUG_TOOLBAR_PANELS = [ - "debug_toolbar.panels.versions.VersionsPanel", - "debug_toolbar.panels.timer.TimerPanel", - "debug_toolbar.panels.settings.SettingsPanel", - "debug_toolbar.panels.headers.HeadersPanel", - "debug_toolbar.panels.request.RequestPanel", - "debug_toolbar.panels.sql.SQLPanel", - "debug_toolbar.panels.staticfiles.StaticFilesPanel", - "debug_toolbar.panels.templates.TemplatesPanel", - "debug_toolbar.panels.cache.CachePanel", - "debug_toolbar.panels.signals.SignalsPanel", - "debug_toolbar.panels.logging.LoggingPanel", - "debug_toolbar.panels.redirects.RedirectsPanel", - "debug_toolbar.panels.profiling.ProfilingPanel", - "ddt_api_calls.panels.APICallsPanel", -] # Django extensions INSTALLED_APPS += ["django_extensions"] From dd65884da86fc1f2acf6a1ea42c2f27cb32d678a Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Tue, 13 Feb 2024 10:59:00 +0100 Subject: [PATCH 2/2] :arrow_up: [#3049] Bump django-debug-toolbar to its latest version --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index e5e532741f..7d354eb5ee 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -286,7 +286,7 @@ django-csp-reports==1.8.1 # via # -c requirements/ci.txt # -r requirements/ci.txt -django-debug-toolbar==3.2.1 +django-debug-toolbar==4.3.0 # via -r requirements/dev.in django-decorator-include==3.0 # via