Merge pull request #478 from maykinmedia/deps/zgw-consumers

bump zgw-consumers to 0.35.1, commonground-api-common to 2.0.1, OAF to 0.9.0
maykinmedia · Nov 29, 2024 · 259c9a6 · 259c9a6
2 parents a9979d1 + e0ff502
commit 259c9a6
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 105 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -7,7 +7,10 @@
 amqp==5.2.0
     # via kombu
 ape-pie==0.2.0
-    # via zgw-consumers
+    # via
+    #   commonground-api-common
+    #   notifications-api-common
+    #   zgw-consumers
 asgiref==3.7.2
     # via
     #   django
@@ -56,7 +59,7 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-commonground-api-common==1.13.0
+commonground-api-common==2.1.0
     # via open-api-framework
 coreapi==2.3.3
     # via commonground-api-common
@@ -179,7 +182,7 @@ djangorestframework-gis==1.0
     # via open-api-framework
 djangorestframework-inclusions==1.2.0
     # via open-api-framework
-drf-nested-routers==0.93.3
+drf-nested-routers==0.94.1
     # via commonground-api-common
 drf-spectacular[sidecar]==0.27.2
     # via open-api-framework
@@ -199,11 +202,6 @@ furl==2.1.3
     # via
     #   -r requirements/base.in
     #   ape-pie
-gemma-zds-client==2.0.0
-    # via
-    #   commonground-api-common
-    #   notifications-api-common
-    #   zgw-consumers
 glom==23.5.0
     # via
     #   -r requirements/base.in
@@ -240,7 +238,7 @@ mozilla-django-oidc==4.0.0
     # via mozilla-django-oidc-db
 mozilla-django-oidc-db==0.19.0
     # via open-api-framework
-notifications-api-common==0.2.2
+notifications-api-common==0.3.1
     # via
     #   -r requirements/base.in
     #   commonground-api-common
@@ -265,13 +263,12 @@ pycparser==2.20
 pyjwt==2.4.0
     # via
     #   commonground-api-common
-    #   gemma-zds-client
+    #   zgw-consumers
 pyopenssl==24.0.0
     # via
     #   django-simple-certmanager
     #   josepy
     #   webauthn
-    #   zgw-consumers
 pyrsistent==0.17.3
     # via jsonschema
 python-dateutil==2.9.0.post0
@@ -290,7 +287,6 @@ pyyaml==6.0.1
     # via
     #   drf-spectacular
     #   drf-yasg
-    #   gemma-zds-client
     #   oyaml
 qrcode==6.1
     # via django-two-factor-auth
@@ -302,10 +298,12 @@ requests==2.32.3
     #   commonground-api-common
     #   coreapi
     #   django-log-outgoing-requests
-    #   gemma-zds-client
     #   mozilla-django-oidc
     #   open-api-framework
+    #   requests-mock
     #   zgw-consumers
+requests-mock==1.12.1
+    # via commonground-api-common
 sentry-sdk==2.12.0
     # via open-api-framework
 six==1.16.0
@@ -321,7 +319,9 @@ sqlparse==0.5.0
 tornado==6.4.1
     # via flower
 typing-extensions==4.9.0
-    # via mozilla-django-oidc-db
+    # via
+    #   mozilla-django-oidc-db
+    #   zgw-consumers
 tzdata==2024.1
     # via celery
 uritemplate==3.0.1
@@ -349,8 +349,9 @@ webencodings==0.5.1
     # via bleach
 wrapt==1.14.1
     # via elastic-apm
-zgw-consumers==0.29.0
+zgw-consumers==0.35.1
     # via
+    #   commonground-api-common
     #   notifications-api-common
     #   open-api-framework
 

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -11,6 +11,8 @@ amqp==5.2.0
 ape-pie==0.2.0
     # via
     #   -r requirements/base.txt
+    #   commonground-api-common
+    #   notifications-api-common
     #   zgw-consumers
 asgiref==3.7.2
     # via
@@ -91,7 +93,7 @@ click-repl==0.3.0
     #   celery
 codecov==2.1.13
     # via -r requirements/ci.in
-commonground-api-common==1.13.0
+commonground-api-common==2.1.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
@@ -279,7 +281,7 @@ djangorestframework-inclusions==1.2.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
-drf-nested-routers==0.93.3
+drf-nested-routers==0.94.1
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
@@ -323,12 +325,6 @@ furl==2.1.3
     # via
     #   -r requirements/base.txt
     #   ape-pie
-gemma-zds-client==2.0.0
-    # via
-    #   -r requirements/base.txt
-    #   commonground-api-common
-    #   notifications-api-common
-    #   zgw-consumers
 glom==23.5.0
     # via
     #   -r requirements/base.txt
@@ -403,7 +399,7 @@ multidict==6.0.5
     # via yarl
 mypy-extensions==1.0.0
     # via black
-notifications-api-common==0.2.2
+notifications-api-common==0.3.1
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
@@ -457,14 +453,13 @@ pyjwt==2.4.0
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-    #   gemma-zds-client
+    #   zgw-consumers
 pyopenssl==24.0.0
     # via
     #   -r requirements/base.txt
     #   django-simple-certmanager
     #   josepy
     #   webauthn
-    #   zgw-consumers
 pyquery==1.4.3
     # via -r requirements/test-tools.in
 pyrsistent==0.17.3
@@ -498,7 +493,6 @@ pyyaml==6.0.1
     #   -r requirements/base.txt
     #   drf-spectacular
     #   drf-yasg
-    #   gemma-zds-client
     #   oyaml
     #   vcrpy
 qrcode==6.1
@@ -517,13 +511,15 @@ requests==2.32.3
     #   commonground-api-common
     #   coreapi
     #   django-log-outgoing-requests
-    #   gemma-zds-client
     #   mozilla-django-oidc
     #   open-api-framework
     #   requests-mock
     #   zgw-consumers
-requests-mock==1.8.0
-    # via -r requirements/test-tools.in
+requests-mock==1.12.1
+    # via
+    #   -r requirements/base.txt
+    #   -r requirements/test-tools.in
+    #   commonground-api-common
 sentry-sdk==2.12.0
     # via
     #   -r requirements/base.txt
@@ -537,7 +533,6 @@ six==1.16.0
     #   orderedmultidict
     #   python-dateutil
     #   qrcode
-    #   requests-mock
     #   webtest
 soupsieve==2.2.1
     # via beautifulsoup4
@@ -557,6 +552,7 @@ typing-extensions==4.9.0
     # via
     #   -r requirements/base.txt
     #   mozilla-django-oidc-db
+    #   zgw-consumers
 tzdata==2024.1
     # via
     #   -r requirements/base.txt
@@ -610,9 +606,10 @@ wrapt==1.14.1
     #   vcrpy
 yarl==1.9.4
     # via vcrpy
-zgw-consumers==0.29.0
+zgw-consumers==0.35.1
     # via
     #   -r requirements/base.txt
+    #   commonground-api-common
     #   notifications-api-common
     #   open-api-framework
 

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -13,6 +13,8 @@ amqp==5.2.0
 ape-pie==0.2.0
     # via
     #   -r requirements/base.txt
+    #   commonground-api-common
+    #   notifications-api-common
     #   zgw-consumers
 asgiref==3.7.2
     # via
@@ -100,7 +102,7 @@ click-repl==0.3.0
     # via
     #   -r requirements/base.txt
     #   celery
-commonground-api-common==1.13.0
+commonground-api-common==2.1.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
@@ -300,7 +302,7 @@ docutils==0.18.1
     #   sphinx
     #   sphinx-rtd-theme
     #   sphinx-tabs
-drf-nested-routers==0.93.3
+drf-nested-routers==0.94.1
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
@@ -344,12 +346,6 @@ furl==2.1.3
     # via
     #   -r requirements/base.txt
     #   ape-pie
-gemma-zds-client==2.0.0
-    # via
-    #   -r requirements/base.txt
-    #   commonground-api-common
-    #   notifications-api-common
-    #   zgw-consumers
 glom==23.5.0
     # via
     #   -r requirements/base.txt
@@ -425,7 +421,7 @@ multidict==6.0.5
     # via yarl
 mypy-extensions==0.4.3
     # via black
-notifications-api-common==0.2.2
+notifications-api-common==0.3.1
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
@@ -484,14 +480,13 @@ pyjwt==2.4.0
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-    #   gemma-zds-client
+    #   zgw-consumers
 pyopenssl==24.0.0
     # via
     #   -r requirements/base.txt
     #   django-simple-certmanager
     #   josepy
     #   webauthn
-    #   zgw-consumers
 pyproject-hooks==1.0.0
     # via
     #   build
@@ -528,7 +523,6 @@ pyyaml==6.0.1
     #   -r requirements/base.txt
     #   drf-spectacular
     #   drf-yasg
-    #   gemma-zds-client
     #   oyaml
     #   vcrpy
 qrcode==6.1
@@ -548,14 +542,16 @@ requests==2.32.3
     #   commonground-api-common
     #   coreapi
     #   django-log-outgoing-requests
-    #   gemma-zds-client
     #   mozilla-django-oidc
     #   open-api-framework
     #   requests-mock
     #   sphinx
     #   zgw-consumers
-requests-mock==1.8.0
-    # via -r requirements/test-tools.in
+requests-mock==1.12.1
+    # via
+    #   -r requirements/base.txt
+    #   -r requirements/test-tools.in
+    #   commonground-api-common
 sentry-sdk==2.12.0
     # via
     #   -r requirements/base.txt
@@ -569,7 +565,6 @@ six==1.16.0
     #   orderedmultidict
     #   python-dateutil
     #   qrcode
-    #   requests-mock
     #   webtest
 snowballstemmer==2.1.0
     # via sphinx
@@ -617,6 +612,7 @@ typing-extensions==4.9.0
     # via
     #   -r requirements/base.txt
     #   mozilla-django-oidc-db
+    #   zgw-consumers
 tzdata==2024.1
     # via
     #   -r requirements/base.txt
@@ -672,9 +668,10 @@ wrapt==1.14.1
     #   vcrpy
 yarl==1.9.4
     # via vcrpy
-zgw-consumers==0.29.0
+zgw-consumers==0.35.1
     # via
     #   -r requirements/base.txt
+    #   commonground-api-common
     #   notifications-api-common
     #   open-api-framework
 

diff --git a/src/objects/conf/base.py b/src/objects/conf/base.py
@@ -66,10 +66,6 @@
 # Relying Party name for WebAuthn (hardware tokens)
 TWO_FACTOR_WEBAUTHN_RP_NAME = "objects api"
 
-
-# VNG API Common
-CUSTOM_CLIENT_FETCHER = "objects.utils.client.get_client"
-
 # settings for sending notifications
 NOTIFICATIONS_KANAAL = "objecten"
 

diff --git a/src/objects/core/tests/factories.py b/src/objects/core/tests/factories.py
@@ -6,22 +6,11 @@
 
 import factory
 from factory.fuzzy import BaseFuzzyAttribute
-from zgw_consumers.constants import APITypes, AuthTypes
-from zgw_consumers.models import Service
+from zgw_consumers.test.factories import ServiceFactory
 
 from ..models import Object, ObjectRecord, ObjectType
 
 
-class ServiceFactory(factory.django.DjangoModelFactory):
-    label = factory.Faker("word")
-    api_root = factory.Faker("url")
-    api_type = APITypes.orc
-    auth_type = AuthTypes.no_auth
-
-    class Meta:
-        model = Service
-
-
 class ObjectTypeFactory(factory.django.DjangoModelFactory):
     service = factory.SubFactory(ServiceFactory)
     uuid = factory.LazyFunction(uuid.uuid4)

diff --git a/src/objects/fixtures/demodata.json b/src/objects/fixtures/demodata.json
@@ -805,6 +805,7 @@
     "pk": 1,
     "fields": {
         "label": "Objecttypen API",
+        "slug": "objecttypen-api",
         "api_type": "orc",
         "api_root": "http://localhost:8001/api/v1/",
         "client_id": "",