⬆️ Bump to bugfix release of django-axes

open-formulieren · Oct 31, 2023 · aa849ee · aa849ee
1 parent f221ef6
commit aa849ee
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 182 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -39,13 +39,6 @@ COPY ./requirements /app/requirements
 ARG TARGET_ENVIRONMENT=production
 RUN pip install -r requirements/${TARGET_ENVIRONMENT}.txt
 
-# Apply patches of third party libraries
-COPY ./patches /tmp/patches
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        git \
-    && rm -rf /var/lib/apt/lists/* \
-    && /tmp/patches/apply.sh /usr/local/lib/python3.10/site-packages
-
 # Stage 2 - Install frontend deps and build assets
 FROM node:16-bookworm-slim AS frontend-build
 

diff --git a/patches/README.md b/patches/README.md
diff --git a/patches/apply.sh b/patches/apply.sh
diff --git a/patches/yubin_001.patch b/patches/yubin_001.patch
diff --git a/patches/yubin_002.patch b/patches/yubin_002.patch
diff --git a/patches/yubin_003.patch b/patches/yubin_003.patch
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -24,9 +24,7 @@ beautifulsoup4==4.10.0
 billiard==3.6.4.0
     # via celery
 bleach[css]==5.0.1
-    # via
-    #   -r requirements/base.in
-    #   bleach
+    # via -r requirements/base.in
 boltons==21.0.0
     # via
     #   face
@@ -216,7 +214,7 @@ django-tinymce==3.6.1
     # via -r requirements/base.in
 django-treebeard==4.7
     # via -r requirements/base.in
-django-yubin==2.0.1
+django-yubin==2.0.2
     # via -r requirements/base.in
 djangorestframework==3.14.0
     # via

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -54,7 +54,6 @@ bleach[css]==5.0.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   bleach
 boltons==21.0.0
     # via
     #   -c requirements/base.txt
@@ -226,7 +225,6 @@ django-axes[ipware]==6.0.5
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   django-axes
 django-better-admin-arrayfield==1.4.2
     # via
     #   -c requirements/base.txt
@@ -365,7 +363,7 @@ django-treebeard==4.7
     #   -r requirements/base.txt
 django-webtest==1.9.7
     # via -r requirements/test-tools.in
-django-yubin==2.0.1
+django-yubin==2.0.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -565,7 +563,6 @@ maykin-django-two-factor-auth[phonenumbers]==2.0.4
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
 maykin-json-logic-py==0.13.0
     # via
     #   -c requirements/base.txt
@@ -665,7 +662,6 @@ portalocker[redis]==2.3.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   portalocker
 prance==23.6.21.0
     # via
     #   -c requirements/base.txt
@@ -851,7 +847,6 @@ sentry-sdk[django]==1.27.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   sentry-sdk
 simplejson==3.17.6
     # via
     #   -c requirements/base.txt
@@ -924,7 +919,6 @@ tablib[xlsx]==3.0.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   tablib
 tabulate==0.8.9
     # via
     #   -c requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -64,7 +64,6 @@ bleach[css]==5.0.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-    #   bleach
 boltons==21.0.0
     # via
     #   -c requirements/ci.txt
@@ -255,7 +254,6 @@ django-axes[ipware]==6.0.5
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-    #   django-axes
 django-better-admin-arrayfield==1.4.2
     # via
     #   -c requirements/ci.txt
@@ -379,7 +377,6 @@ django-simple-certmanager[testutils]==1.4.1
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   django-digid-eherkenning
-    #   django-simple-certmanager
     #   zgw-consumers
 django-solo==2.1.0
     # via
@@ -406,7 +403,7 @@ django-webtest==1.9.7
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-django-yubin==2.0.1
+django-yubin==2.0.2
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -644,7 +641,6 @@ maykin-django-two-factor-auth[phonenumbers]==2.0.4
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-    #   maykin-django-two-factor-auth
 maykin-json-logic-py==0.13.0
     # via
     #   -c requirements/ci.txt
@@ -770,7 +766,6 @@ portalocker[redis]==2.3.2
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-    #   portalocker
 prance==23.6.21.0
     # via
     #   -c requirements/ci.txt
@@ -979,7 +974,6 @@ sentry-sdk[django]==1.27.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-    #   sentry-sdk
 simplejson==3.17.6
     # via
     #   -c requirements/ci.txt
@@ -1087,7 +1081,6 @@ tablib[xlsx]==3.0.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-    #   tablib
 tabulate==0.8.9
     # via
     #   -c requirements/ci.txt

diff --git a/requirements/extensions.txt b/requirements/extensions.txt
@@ -40,7 +40,6 @@ bleach[css]==5.0.1
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-    #   bleach
 boltons==21.0.0
     # via
     #   -r requirements/base.txt
@@ -192,7 +191,6 @@ django-axes[ipware]==6.0.5
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-    #   django-axes
 django-better-admin-arrayfield==1.4.2
     # via
     #   -c requirements/base.in
@@ -319,7 +317,7 @@ django-treebeard==4.7
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-django-yubin==2.0.1
+django-yubin==2.0.2
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
@@ -468,7 +466,6 @@ maykin-django-two-factor-auth[phonenumbers]==2.0.4
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
 maykin-json-logic-py==0.13.0
     # via
     #   -c requirements/base.in
@@ -545,7 +542,6 @@ portalocker[redis]==2.3.2
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-    #   portalocker
 prance==23.6.21.0
     # via
     #   -r requirements/base.txt
@@ -690,7 +686,6 @@ sentry-sdk[django]==1.27.1
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-    #   sentry-sdk
 simplejson==3.17.6
     # via
     #   -r requirements/base.txt
@@ -728,7 +723,6 @@ tablib[xlsx]==3.0.0
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-    #   tablib
 tabulate==0.8.9
     # via
     #   -c requirements/base.in