⬆️ Update dependencies to drop setuptools

open-formulieren · Mar 29, 2024 · 78f74ef · 78f74ef
1 parent 2b7b6b6
commit 78f74ef
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 42 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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