From 78f74ef6aca80692d06f5af6f108b6d0095de753 Mon Sep 17 00:00:00 2001 From: Viicos <65306057+Viicos@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:46:45 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencies?= =?UTF-8?q?=20to=20drop=20`setuptools`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INSTALL.rst | 2 +- requirements/base.in | 5 +---- requirements/base.txt | 11 ++--------- requirements/ci.txt | 12 ++---------- requirements/dev.txt | 11 +++-------- requirements/extensions.txt | 12 ++---------- 6 files changed, 11 insertions(+), 42 deletions(-) diff --git a/INSTALL.rst b/INSTALL.rst index 5c1416cff4..0076c27e2a 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -44,7 +44,7 @@ You will also need the following operating-system libraries: .. _Python: https://www.python.org/ .. _Django framework: https://www.djangoproject.com/ .. _Virtualenv: https://virtualenv.pypa.io/en/stable/ -.. _Pip: https://packaging.python.org/tutorials/installing-packages/#ensure-pip-setuptools-and-wheel-are-up-to-date +.. _Pip: https://pip.pypa.io/en/stable/installation/ .. _PostgreSQL: https://www.postgresql.org .. _Node.js: http://nodejs.org/ .. _nvm: https://github.com/nvm-sh/nvm diff --git a/requirements/base.in b/requirements/base.in index c3a19c7977..84510fb0ab 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -4,6 +4,7 @@ bleach[css] >= 5 celery ~= 5.0 celery-once defusedxml +frozendict furl glom maykin-json-logic-py @@ -33,10 +34,6 @@ tabulate typing-extensions weasyprint zeep -# Pinned setuptools to a version lower than 58 to allow pyzmail36 to be -# installed, as required by django-yubin. -setuptools -frozendict # Framework libraries django ~= 4.2 diff --git a/requirements/base.txt b/requirements/base.txt index 45e2bb597b..ee1af1068a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -140,7 +140,7 @@ django-appconf==1.0.4 # django-timeline-logger django-autoslug==1.9.9 # via -r requirements/base.in -django-axes[ipware]==6.0.5 +django-axes[ipware]==6.4.0 # via -r requirements/base.in django-camunda==0.14.0 # via -r requirements/base.in @@ -278,7 +278,7 @@ isodate==0.6.1 # maykin-json-logic-py # maykin-python3-saml # zeep -josepy==1.8.0 +josepy==1.14.0 # via mozilla-django-oidc jq==1.3.0 # via -r requirements/base.in @@ -529,10 +529,3 @@ zgw-consumers==0.32.0 # via -r requirements/base.in zopfli==0.2.3 # via fonttools - -# The following packages are considered to be unsafe in a requirements file: -setuptools==65.6.3 - # via - # -r requirements/base.in - # django-axes - # josepy diff --git a/requirements/ci.txt b/requirements/ci.txt index 016806c9dd..687bdbba15 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -226,7 +226,7 @@ django-autoslug==1.9.9 # via # -c requirements/base.txt # -r requirements/base.txt -django-axes[ipware]==6.0.5 +django-axes[ipware]==6.4.0 # via # -c requirements/base.txt # -r requirements/base.txt @@ -515,7 +515,7 @@ isort==5.10.1 # via -r requirements/test-tools.in jinja2==3.1.3 # via sphinx -josepy==1.8.0 +josepy==1.14.0 # via # -c requirements/base.txt # -r requirements/base.txt @@ -1082,11 +1082,3 @@ zopfli==0.2.3 # -c requirements/base.txt # -r requirements/base.txt # fonttools - -# The following packages are considered to be unsafe in a requirements file: -setuptools==65.6.3 - # via - # -c requirements/base.txt - # -r requirements/base.txt - # django-axes - # josepy diff --git a/requirements/dev.txt b/requirements/dev.txt index 317d901e63..cb96f93d7d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -253,7 +253,7 @@ django-autoslug==1.9.9 # via # -c requirements/ci.txt # -r requirements/ci.txt -django-axes[ipware]==6.0.5 +django-axes[ipware]==6.4.0 # via # -c requirements/ci.txt # -r requirements/ci.txt @@ -587,7 +587,7 @@ jinja2==3.1.3 # -c requirements/ci.txt # -r requirements/ci.txt # sphinx -josepy==1.8.0 +josepy==1.14.0 # via # -c requirements/ci.txt # -r requirements/ci.txt @@ -1275,9 +1275,4 @@ zopfli==0.2.3 pip==23.3.1 # via pip-tools setuptools==65.6.3 - # via - # -c requirements/ci.txt - # -r requirements/ci.txt - # django-axes - # josepy - # pip-tools + # via pip-tools diff --git a/requirements/extensions.txt b/requirements/extensions.txt index 1a5f1fa140..76e62d714e 100644 --- a/requirements/extensions.txt +++ b/requirements/extensions.txt @@ -191,7 +191,7 @@ django-autoslug==1.9.9 # via # -c requirements/base.in # -r requirements/base.txt -django-axes[ipware]==6.0.5 +django-axes[ipware]==6.4.0 # via # -c requirements/base.in # -r requirements/base.txt @@ -424,7 +424,7 @@ isodate==0.6.1 # maykin-json-logic-py # maykin-python3-saml # zeep -josepy==1.8.0 +josepy==1.14.0 # via # -r requirements/base.txt # mozilla-django-oidc @@ -836,11 +836,3 @@ zopfli==0.2.3 # via # -r requirements/base.txt # fonttools - -# The following packages are considered to be unsafe in a requirements file: -setuptools==65.6.3 - # via - # -c requirements/base.in - # -r requirements/base.txt - # django-axes - # josepy From 8b2a8ab0324dc1c16e6c9aaf4f3fbdf5cf93baf3 Mon Sep 17 00:00:00 2001 From: Viicos <65306057+Viicos@users.noreply.github.com> Date: Fri, 29 Mar 2024 16:09:35 +0100 Subject: [PATCH 2/3] Remove `django-decorator-include` dependency --- requirements/base.in | 1 - requirements/base.txt | 3 --- requirements/ci.txt | 5 ----- requirements/dev.txt | 5 ----- requirements/extensions.txt | 5 ----- 5 files changed, 19 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 84510fb0ab..ab795ee547 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -45,7 +45,6 @@ django-capture-tag django-colorfield django-cookie-consent django-cors-headers -django-decorator-include django-digid-eherkenning django-hijack django-jsonform diff --git a/requirements/base.txt b/requirements/base.txt index ee1af1068a..1c7c145fb4 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -100,7 +100,6 @@ django==4.2.11 # django-cors-headers # django-csp # django-csp-reports - # django-decorator-include # django-digid-eherkenning # django-filter # django-formtools @@ -156,8 +155,6 @@ django-csp==3.7 # via -r requirements/base.in django-csp-reports==1.8.1 # via -r requirements/base.in -django-decorator-include==3.0 - # via -r requirements/base.in django-digid-eherkenning==0.12.0 # via -r requirements/base.in django-filter==23.2 diff --git a/requirements/ci.txt b/requirements/ci.txt index 687bdbba15..ffe7384cfd 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -179,7 +179,6 @@ django==4.2.11 # django-cors-headers # django-csp # django-csp-reports - # django-decorator-include # django-digid-eherkenning # django-filter # django-formtools @@ -259,10 +258,6 @@ django-csp-reports==1.8.1 # via # -c requirements/base.txt # -r requirements/base.txt -django-decorator-include==3.0 - # via - # -c requirements/base.txt - # -r requirements/base.txt django-digid-eherkenning==0.12.0 # via # -c requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index cb96f93d7d..54e2e32259 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -203,7 +203,6 @@ django==4.2.11 # django-csp # django-csp-reports # django-debug-toolbar - # django-decorator-include # django-digid-eherkenning # django-extensions # django-filter @@ -288,10 +287,6 @@ django-csp-reports==1.8.1 # -r requirements/ci.txt django-debug-toolbar==4.3.0 # via -r requirements/dev.in -django-decorator-include==3.0 - # via - # -c requirements/ci.txt - # -r requirements/ci.txt django-digid-eherkenning==0.12.0 # via # -c requirements/ci.txt diff --git a/requirements/extensions.txt b/requirements/extensions.txt index 76e62d714e..d49c80f0c5 100644 --- a/requirements/extensions.txt +++ b/requirements/extensions.txt @@ -144,7 +144,6 @@ django==4.2.11 # django-cors-headers # django-csp # django-csp-reports - # django-decorator-include # django-digid-eherkenning # django-filter # django-formtools @@ -224,10 +223,6 @@ django-csp-reports==1.8.1 # via # -c requirements/base.in # -r requirements/base.txt -django-decorator-include==3.0 - # via - # -c requirements/base.in - # -r requirements/base.txt django-digid-eherkenning==0.12.0 # via # -c requirements/base.in From fe7e7b3757610d38e5d13753709447c4baf62c71 Mon Sep 17 00:00:00 2001 From: Viicos <65306057+Viicos@users.noreply.github.com> Date: Fri, 29 Mar 2024 17:49:10 +0100 Subject: [PATCH 3/3] Use vendored decorator --- src/openforms/admin/urls.py | 2 +- src/openforms/api/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openforms/admin/urls.py b/src/openforms/admin/urls.py index 5bd3387d4c..61ca76ed39 100644 --- a/src/openforms/admin/urls.py +++ b/src/openforms/admin/urls.py @@ -3,12 +3,12 @@ from django.contrib.auth import views as auth_views from django.urls import include, path -from decorator_include import decorator_include from maykin_2fa import monkeypatch_admin from maykin_2fa.urls import urlpatterns, webauthn_urlpatterns from mozilla_django_oidc_db.views import AdminLoginFailure from openforms.emails.admin import EmailTestAdminView +from openforms.utils.urls import decorator_include from .views import AdminLoginRedirectView, ClassicAdminLoginView diff --git a/src/openforms/api/urls.py b/src/openforms/api/urls.py index 6371cfd78f..0809cbdadf 100644 --- a/src/openforms/api/urls.py +++ b/src/openforms/api/urls.py @@ -1,7 +1,6 @@ from django.urls import include, path from django.views.generic import RedirectView -from decorator_include import decorator_include from drf_spectacular.views import ( SpectacularAPIView, SpectacularJSONAPIView, @@ -25,6 +24,7 @@ from openforms.submissions.api.viewsets import SubmissionStepViewSet, SubmissionViewSet from openforms.utils.decorators import never_cache from openforms.utils.json_logic.api.views import GenerateLogicDescriptionView +from openforms.utils.urls import decorator_include from openforms.variables.api.viewsets import ServiceFetchConfigurationViewSet from .views import PingView