Merge pull request #1468 from open-zaak/feature/1418-remove-django-ch…

…oices remove django choices
open-zaak · Oct 23, 2023 · 20c10ac · 20c10ac
2 parents 3c00b40 + 61caafb
commit 20c10ac
Show file tree

Hide file tree

Showing 19 changed files with 276 additions and 309 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -18,7 +18,6 @@ bleach
 # Framework libraries
 django
 django-axes
-django-choices
 django-cors-headers
 django-db-logger
 django-extra-views

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    ./bin/compile_dependencies.sh
@@ -33,6 +33,7 @@ celery==5.2.7
     #   notifications-api-common
 certifi==2022.12.7
     # via
+    #   django-simple-certmanager
     #   elastic-apm
     #   requests
     #   self-certifi
@@ -56,12 +57,13 @@ click-repl==0.2.0
     # via celery
 cmislib-maykin==0.7.4
     # via drc-cmis
-commonground-api-common==1.10.2
+commonground-api-common==1.11.0
     # via
     #   -r requirements/base.in
     #   drc-cmis
 coreapi==2.3.3
     # via
+    #   commonground-api-common
     #   django-loose-fk
     #   drf-yasg
 coreschema==0.0.4
@@ -70,6 +72,7 @@ coreschema==0.0.4
     #   drf-yasg
 cryptography==39.0.1
     # via
+    #   django-simple-certmanager
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
@@ -83,7 +86,6 @@ django==3.2.18
     #   commonground-api-common
     #   django-admin-index
     #   django-axes
-    #   django-choices
     #   django-cors-headers
     #   django-db-logger
     #   django-extra-views
@@ -115,13 +117,6 @@ django-better-admin-arrayfield==1.4.2
     # via
     #   -r requirements/base.in
     #   mozilla-django-oidc-db
-django-choices==1.7.2
-    # via
-    #   -r requirements/base.in
-    #   commonground-api-common
-    #   django-simple-certmanager
-    #   drc-cmis
-    #   zgw-consumers
 django-cors-headers==3.11.0
     # via -r requirements/base.in
 django-db-logger==0.1.12
@@ -141,21 +136,21 @@ django-markup==1.5
     # via -r requirements/base.in
 django-ordered-model==3.5
     # via django-admin-index
-django-privates==1.3.0
+django-privates==2.0.0.post0
     # via
     #   -r requirements/base.in
     #   django-simple-certmanager
 django-redis==5.2.0
     # via -r requirements/base.in
-django-relativedelta==1.1.2
+django-relativedelta==2.0.0
     # via
     #   -r requirements/base.in
     #   zgw-consumers
 django-rest-framework-condition==0.1.1
     # via commonground-api-common
 django-sendfile2==0.7.0
     # via django-privates
-django-simple-certmanager==1.0.0
+django-simple-certmanager==1.3.0
     # via zgw-consumers
 django-sniplates==0.7.0
     # via -r requirements/base.in
@@ -183,7 +178,7 @@ djangorestframework-camel-case==1.2.0
     #   notifications-api-common
 djangorestframework-gis==0.18
     # via -r requirements/base.in
-drc-cmis==1.7.0
+drc-cmis==1.8.0
     # via -r requirements/base.in
 drf-extra-fields==3.4.0
     # via -r requirements/base.in
@@ -220,8 +215,6 @@ humanize==4.0.0
     #   flower
 idna==3.3
     # via requests
-importlib-metadata==4.11.3
-    # via markdown
 inflection==0.5.1
     # via drf-yasg
 iso-639==0.4.5
@@ -338,7 +331,6 @@ six==1.16.0
     #   bleach
     #   click-repl
     #   cmislib-maykin
-    #   django-choices
     #   django-db-logger
     #   furl
     #   isodate
@@ -377,12 +369,10 @@ wrapt==1.14.1
     # via
     #   deprecated
     #   elastic-apm
-zgw-consumers==0.23.1
+zgw-consumers==0.26.2
     # via
     #   -r requirements/base.in
     #   notifications-api-common
-zipp==3.8.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    ./bin/compile_dependencies.sh
@@ -52,6 +52,7 @@ celery==5.2.7
 certifi==2022.12.7
     # via
     #   -r requirements/base.txt
+    #   django-simple-certmanager
     #   elastic-apm
     #   requests
     #   self-certifi
@@ -89,13 +90,14 @@ cmislib-maykin==0.7.4
     # via
     #   -r requirements/base.txt
     #   drc-cmis
-commonground-api-common==1.10.2
+commonground-api-common==1.11.0
     # via
     #   -r requirements/base.txt
     #   drc-cmis
 coreapi==2.3.3
     # via
     #   -r requirements/base.txt
+    #   commonground-api-common
     #   django-loose-fk
     #   drf-yasg
 coreschema==0.0.4
@@ -108,6 +110,7 @@ coverage==6.3.2
 cryptography==39.0.1
     # via
     #   -r requirements/base.txt
+    #   django-simple-certmanager
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
@@ -123,7 +126,6 @@ django==3.2.18
     #   commonground-api-common
     #   django-admin-index
     #   django-axes
-    #   django-choices
     #   django-cors-headers
     #   django-db-logger
     #   django-extra-views
@@ -155,13 +157,6 @@ django-better-admin-arrayfield==1.4.2
     # via
     #   -r requirements/base.txt
     #   mozilla-django-oidc-db
-django-choices==1.7.2
-    # via
-    #   -r requirements/base.txt
-    #   commonground-api-common
-    #   django-simple-certmanager
-    #   drc-cmis
-    #   zgw-consumers
 django-cors-headers==3.11.0
     # via -r requirements/base.txt
 django-db-logger==0.1.12
@@ -185,13 +180,13 @@ django-ordered-model==3.5
     # via
     #   -r requirements/base.txt
     #   django-admin-index
-django-privates==1.3.0
+django-privates==2.0.0.post0
     # via
     #   -r requirements/base.txt
     #   django-simple-certmanager
 django-redis==5.2.0
     # via -r requirements/base.txt
-django-relativedelta==1.1.2
+django-relativedelta==2.0.0
     # via
     #   -r requirements/base.txt
     #   zgw-consumers
@@ -203,7 +198,7 @@ django-sendfile2==0.7.0
     # via
     #   -r requirements/base.txt
     #   django-privates
-django-simple-certmanager==1.0.0
+django-simple-certmanager==1.3.0
     # via
     #   -r requirements/base.txt
     #   zgw-consumers
@@ -236,7 +231,7 @@ djangorestframework-camel-case==1.2.0
     #   notifications-api-common
 djangorestframework-gis==0.18
     # via -r requirements/base.txt
-drc-cmis==1.7.0
+drc-cmis==1.8.0
     # via -r requirements/base.txt
 drf-extra-fields==3.4.0
     # via -r requirements/base.txt
@@ -295,10 +290,6 @@ idna==3.3
     # via
     #   -r requirements/base.txt
     #   requests
-importlib-metadata==4.11.3
-    # via
-    #   -r requirements/base.txt
-    #   markdown
 inflection==0.5.1
     # via
     #   -r requirements/base.txt
@@ -475,7 +466,6 @@ six==1.16.0
     #   bleach
     #   click-repl
     #   cmislib-maykin
-    #   django-choices
     #   django-db-logger
     #   furl
     #   isodate
@@ -542,14 +532,10 @@ wrapt==1.14.1
     #   -r requirements/base.txt
     #   deprecated
     #   elastic-apm
-zgw-consumers==0.23.1
+zgw-consumers==0.26.2
     # via
     #   -r requirements/base.txt
     #   notifications-api-common
-zipp==3.8.0
-    # via
-    #   -r requirements/base.txt
-    #   importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    ./bin/compile_dependencies.sh
@@ -68,6 +68,7 @@ celery==5.2.7
 certifi==2022.12.7
     # via
     #   -r requirements/ci.txt
+    #   django-simple-certmanager
     #   elastic-apm
     #   kubernetes
     #   requests
@@ -106,7 +107,7 @@ cmislib-maykin==0.7.4
     # via
     #   -r requirements/ci.txt
     #   drc-cmis
-commonground-api-common==1.10.2
+commonground-api-common==1.11.0
     # via
     #   -r requirements/ci.txt
     #   drc-cmis
@@ -115,6 +116,7 @@ commonmark==0.9.1
 coreapi==2.3.3
     # via
     #   -r requirements/ci.txt
+    #   commonground-api-common
     #   django-loose-fk
     #   drf-yasg
 coreschema==0.0.4
@@ -128,6 +130,7 @@ cryptography==39.0.1
     # via
     #   -r requirements/ci.txt
     #   ansible-core
+    #   django-simple-certmanager
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
@@ -143,7 +146,6 @@ django==3.2.18
     #   commonground-api-common
     #   django-admin-index
     #   django-axes
-    #   django-choices
     #   django-cors-headers
     #   django-db-logger
     #   django-debug-toolbar
@@ -178,13 +180,6 @@ django-better-admin-arrayfield==1.4.2
     # via
     #   -r requirements/ci.txt
     #   mozilla-django-oidc-db
-django-choices==1.7.2
-    # via
-    #   -r requirements/ci.txt
-    #   commonground-api-common
-    #   django-simple-certmanager
-    #   drc-cmis
-    #   zgw-consumers
 django-cors-headers==3.11.0
     # via -r requirements/ci.txt
 django-db-logger==0.1.12
@@ -212,13 +207,13 @@ django-ordered-model==3.5
     # via
     #   -r requirements/ci.txt
     #   django-admin-index
-django-privates==1.3.0
+django-privates==2.0.0.post0
     # via
     #   -r requirements/ci.txt
     #   django-simple-certmanager
 django-redis==5.2.0
     # via -r requirements/ci.txt
-django-relativedelta==1.1.2
+django-relativedelta==2.0.0
     # via
     #   -r requirements/ci.txt
     #   zgw-consumers
@@ -232,7 +227,7 @@ django-sendfile2==0.7.0
     #   django-privates
 django-silk==4.3.0
     # via -r requirements/dev.in
-django-simple-certmanager==1.0.0
+django-simple-certmanager==1.3.0
     # via
     #   -r requirements/ci.txt
     #   zgw-consumers
@@ -271,7 +266,7 @@ docutils==0.17.1
     #   sphinx
     #   sphinx-rtd-theme
     #   sphinx-tabs
-drc-cmis==1.7.0
+drc-cmis==1.8.0
     # via -r requirements/ci.txt
 drf-extra-fields==3.4.0
     # via -r requirements/ci.txt
@@ -340,11 +335,6 @@ idna==3.3
     #   requests
 imagesize==1.1.0
     # via sphinx
-importlib-metadata==4.11.3
-    # via
-    #   -r requirements/ci.txt
-    #   markdown
-    #   sphinx
 inflection==0.5.1
     # via
     #   -r requirements/ci.txt
@@ -588,7 +578,6 @@ six==1.16.0
     #   bleach
     #   click-repl
     #   cmislib-maykin
-    #   django-choices
     #   django-db-logger
     #   furl
     #   google-auth
@@ -709,14 +698,10 @@ wrapt==1.14.1
     #   -r requirements/ci.txt
     #   deprecated
     #   elastic-apm
-zgw-consumers==0.23.1
+zgw-consumers==0.26.2
     # via
     #   -r requirements/ci.txt
     #   notifications-api-common
-zipp==3.8.0
-    # via
-    #   -r requirements/ci.txt
-    #   importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip