Merge branch 'main' into task/auth-middleware_CDD-2432-rbac-models

UKHSA-Internal · Feb 26, 2025 · bb70e04 · bb70e04
2 parents 3cb46c5 + 0b0debf
commit bb70e04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/metrics/api/urls_construction.py b/metrics/api/urls_construction.py
@@ -236,10 +236,10 @@ def construct_urlpatterns(
 
     match app_mode:
         case enums.AppMode.CMS_ADMIN.value:
+            constructed_url_patterns += django_admin_urlpatterns
             constructed_url_patterns += construct_cms_admin_urlpatterns(
                 app_mode=app_mode
             )
-            constructed_url_patterns += django_admin_urlpatterns
             constructed_url_patterns += audit_api_urlpatterns
         case enums.AppMode.PUBLIC_API.value:
             constructed_url_patterns += construct_public_api_urlpatterns(

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,7 @@
 bandit==1.8.3
 black==25.1.0
 coverage==7.6.12
-cyclonedx-python-lib==8.8.0
+cyclonedx-python-lib==8.9.0
 django-factory-boy==1.0.0
 factory-boy==3.3.3
 Faker==36.1.1

diff --git a/requirements-prod.txt b/requirements-prod.txt
@@ -71,7 +71,7 @@ ruamel.yaml==0.18.10
 ruamel.yaml.clib==0.2.12
 SQLAlchemy==2.0.38
 scour==0.38.2
-setuptools==75.8.0
+setuptools==75.8.1
 simplejson==3.20.1
 six==1.17.0
 sortedcontainers==2.4.0