From e667b3b5787180ce847d5fafc958ccfa7b68b240 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Wed, 13 Nov 2024 14:42:11 +0100 Subject: [PATCH 1/5] [#66] update zgw-consumers --- requirements/base.in | 2 ++ requirements/base.txt | 32 ++++++++++++++++++++------------ requirements/ci.txt | 32 +++++++++++++++++++------------- requirements/dev.txt | 32 +++++++++++++++++++------------- 4 files changed, 60 insertions(+), 38 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index d764f73a..241366ac 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1 +1,3 @@ open-api-framework + +git+https://github.com/maykinmedia/commonground-api-common@feature/update-notifs-client diff --git a/requirements/base.txt b/requirements/base.txt index 8ebfb3c3..6986f158 100644 --- 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.8.1 # via # django @@ -56,8 +59,10 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -commonground-api-common==1.13.4 - # via open-api-framework +commonground-api-common @ git+https://github.com/maykinmedia/commonground-api-common@feature/update-notifs-client + # via + # -r requirements/base.in + # open-api-framework coreapi==2.3.3 # via commonground-api-common coreschema==0.0.4 @@ -106,6 +111,7 @@ django==4.2.15 # notifications-api-common # open-api-framework # zgw-consumers + # zgw-consumers-oas django-admin-index==3.1.1 # via open-api-framework django-appconf==1.0.6 @@ -193,14 +199,12 @@ elastic-apm==6.23.0 # via open-api-framework face==20.1.1 # via glom +faker==32.1.0 + # via zgw-consumers-oas flower==2.0.1 # via open-api-framework furl==2.1.3 # via ape-pie -gemma-zds-client==2.0.0 - # via - # commonground-api-common - # notifications-api-common glom==23.5.0 # via mozilla-django-oidc-db humanize==4.10.0 @@ -235,7 +239,7 @@ mozilla-django-oidc==4.0.1 # 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.0 # via commonground-api-common open-api-framework==0.9.0 # via -r requirements/base.in @@ -258,7 +262,6 @@ pycparser==2.22 pyjwt==2.9.0 # via # commonground-api-common - # gemma-zds-client # zgw-consumers pyopenssl==24.2.1 # via @@ -270,6 +273,7 @@ python-dateutil==2.9.0.post0 # via # celery # django-relativedelta + # faker python-decouple==3.8 # via open-api-framework python-dotenv==1.0.1 @@ -282,8 +286,8 @@ pyyaml==6.0.1 # via # drf-spectacular # drf-yasg - # gemma-zds-client # oyaml + # zgw-consumers-oas qrcode==7.4.2 # via django-two-factor-auth redis==5.0.8 @@ -298,7 +302,6 @@ requests==2.32.3 # commonground-api-common # coreapi # django-log-outgoing-requests - # gemma-zds-client # mozilla-django-oidc # open-api-framework # zgw-consumers @@ -321,9 +324,11 @@ tornado==6.4.1 # via flower typing-extensions==4.12.2 # via + # faker # mozilla-django-oidc-db # qrcode # zgw-consumers + # zgw-consumers-oas tzdata==2024.1 # via celery uritemplate==4.1.1 @@ -351,7 +356,10 @@ webencodings==0.5.1 # via bleach wrapt==1.16.0 # via elastic-apm -zgw-consumers==0.34.0 +zgw-consumers==0.35.1 # via + # commonground-api-common # notifications-api-common # open-api-framework +zgw-consumers-oas==1.0.0 + # via commonground-api-common diff --git a/requirements/ci.txt b/requirements/ci.txt index 1d32d180..094472e6 100644 --- a/requirements/ci.txt +++ b/requirements/ci.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.8.1 # via @@ -97,7 +99,7 @@ click-repl==0.3.0 # celery codecov==2.1.13 # via -r requirements/ci.in -commonground-api-common==1.13.4 +commonground-api-common @ git+https://github.com/maykinmedia/commonground-api-common@feature/update-notifs-client # via # -r requirements/base.txt # open-api-framework @@ -163,6 +165,7 @@ django==4.2.15 # notifications-api-common # open-api-framework # zgw-consumers + # zgw-consumers-oas django-admin-index==3.1.1 # via # -r requirements/base.txt @@ -323,8 +326,11 @@ face==20.1.1 # glom factory-boy==3.3.0 # via -r requirements/test-tools.in -faker==26.1.0 - # via factory-boy +faker==32.1.0 + # via + # -r requirements/base.txt + # factory-boy + # zgw-consumers-oas flake8==7.1.0 # via -r requirements/test-tools.in flower==2.0.1 @@ -337,11 +343,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 glom==23.5.0 # via # -r requirements/base.txt @@ -429,7 +430,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.0 # via # -r requirements/base.txt # commonground-api-common @@ -492,7 +493,6 @@ pyjwt==2.9.0 # via # -r requirements/base.txt # commonground-api-common - # gemma-zds-client # zgw-consumers pylint==3.2.6 # via -r requirements/test-tools.in @@ -534,9 +534,9 @@ pyyaml==6.0.1 # -r requirements/base.txt # drf-spectacular # drf-yasg - # gemma-zds-client # oyaml # vcrpy + # zgw-consumers-oas qrcode==7.4.2 # via # -r requirements/base.txt @@ -560,7 +560,6 @@ requests==2.32.3 # commonground-api-common # coreapi # django-log-outgoing-requests - # gemma-zds-client # mozilla-django-oidc # open-api-framework # requests-mock @@ -631,9 +630,11 @@ tornado==6.4.1 typing-extensions==4.12.2 # via # -r requirements/base.txt + # faker # mozilla-django-oidc-db # qrcode # zgw-consumers + # zgw-consumers-oas tzdata==2024.1 # via # -r requirements/base.txt @@ -689,8 +690,13 @@ wrapt==1.16.0 # vcrpy yarl==1.9.4 # via vcrpy -zgw-consumers==0.34.0 +zgw-consumers==0.35.1 # via # -r requirements/base.txt + # commonground-api-common # notifications-api-common # open-api-framework +zgw-consumers-oas==1.0.0 + # via + # -r requirements/base.txt + # commonground-api-common diff --git a/requirements/dev.txt b/requirements/dev.txt index f7635801..b92e41a5 100644 --- 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.8.1 # via @@ -100,7 +102,7 @@ click-repl==0.3.0 # via # -r requirements/base.txt # celery -commonground-api-common==1.13.4 +commonground-api-common @ git+https://github.com/maykinmedia/commonground-api-common@feature/update-notifs-client # via # -r requirements/base.txt # open-api-framework @@ -166,6 +168,7 @@ django==4.2.15 # notifications-api-common # open-api-framework # zgw-consumers + # zgw-consumers-oas django-admin-index==3.1.1 # via # -r requirements/base.txt @@ -330,8 +333,11 @@ face==20.1.1 # glom factory-boy==3.3.0 # via -r requirements/test-tools.in -faker==26.1.0 - # via factory-boy +faker==32.1.0 + # via + # -r requirements/base.txt + # factory-boy + # zgw-consumers-oas flake8==7.1.0 # via -r requirements/test-tools.in flower==2.0.1 @@ -344,11 +350,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 gitdb==4.0.11 # via gitpython gitpython==3.1.43 @@ -438,7 +439,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.0 # via # -r requirements/base.txt # commonground-api-common @@ -501,7 +502,6 @@ pyjwt==2.9.0 # via # -r requirements/base.txt # commonground-api-common - # gemma-zds-client # zgw-consumers pylint==3.2.6 # via -r requirements/test-tools.in @@ -545,9 +545,9 @@ pyyaml==6.0.1 # -r requirements/base.txt # drf-spectacular # drf-yasg - # gemma-zds-client # oyaml # vcrpy + # zgw-consumers-oas qrcode==7.4.2 # via # -r requirements/base.txt @@ -570,7 +570,6 @@ requests==2.32.3 # commonground-api-common # coreapi # django-log-outgoing-requests - # gemma-zds-client # mozilla-django-oidc # open-api-framework # requests-mock @@ -644,9 +643,11 @@ tornado==6.4.1 typing-extensions==4.12.2 # via # -r requirements/base.txt + # faker # mozilla-django-oidc-db # qrcode # zgw-consumers + # zgw-consumers-oas tzdata==2024.1 # via # -r requirements/base.txt @@ -704,11 +705,16 @@ wrapt==1.16.0 # vcrpy yarl==1.9.4 # via vcrpy -zgw-consumers==0.34.0 +zgw-consumers==0.35.1 # via # -r requirements/base.txt + # commonground-api-common # notifications-api-common # open-api-framework +zgw-consumers-oas==1.0.0 + # via + # -r requirements/base.txt + # commonground-api-common # The following packages are considered to be unsafe in a requirements file: # pip From 931d93ff9e0a9a41f8885f26eb0e58035f721dc9 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Tue, 26 Nov 2024 10:32:46 +0100 Subject: [PATCH 2/5] [#66] update `commonground-api-common` version --- requirements/base.in | 2 +- requirements/base.txt | 14 ++++---------- requirements/ci.txt | 19 ++++++------------- requirements/dev.txt | 19 ++++++------------- 4 files changed, 17 insertions(+), 37 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 241366ac..a2eb6ad6 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,3 +1,3 @@ open-api-framework -git+https://github.com/maykinmedia/commonground-api-common@feature/update-notifs-client +commonground-api-common>=2.0.1 diff --git a/requirements/base.txt b/requirements/base.txt index 6986f158..2cd8e103 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -59,7 +59,7 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -commonground-api-common @ git+https://github.com/maykinmedia/commonground-api-common@feature/update-notifs-client +commonground-api-common==2.0.1 # via # -r requirements/base.in # open-api-framework @@ -111,7 +111,6 @@ django==4.2.15 # notifications-api-common # open-api-framework # zgw-consumers - # zgw-consumers-oas django-admin-index==3.1.1 # via open-api-framework django-appconf==1.0.6 @@ -199,8 +198,6 @@ elastic-apm==6.23.0 # via open-api-framework face==20.1.1 # via glom -faker==32.1.0 - # via zgw-consumers-oas flower==2.0.1 # via open-api-framework furl==2.1.3 @@ -273,7 +270,6 @@ python-dateutil==2.9.0.post0 # via # celery # django-relativedelta - # faker python-decouple==3.8 # via open-api-framework python-dotenv==1.0.1 @@ -287,7 +283,6 @@ pyyaml==6.0.1 # drf-spectacular # drf-yasg # oyaml - # zgw-consumers-oas qrcode==7.4.2 # via django-two-factor-auth redis==5.0.8 @@ -304,7 +299,10 @@ requests==2.32.3 # django-log-outgoing-requests # mozilla-django-oidc # open-api-framework + # requests-mock # zgw-consumers +requests-mock==1.12.1 + # via commonground-api-common rpds-py==0.19.1 # via # jsonschema @@ -324,11 +322,9 @@ tornado==6.4.1 # via flower typing-extensions==4.12.2 # via - # faker # mozilla-django-oidc-db # qrcode # zgw-consumers - # zgw-consumers-oas tzdata==2024.1 # via celery uritemplate==4.1.1 @@ -361,5 +357,3 @@ zgw-consumers==0.35.1 # commonground-api-common # notifications-api-common # open-api-framework -zgw-consumers-oas==1.0.0 - # via commonground-api-common diff --git a/requirements/ci.txt b/requirements/ci.txt index 094472e6..be5ed3bf 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -99,7 +99,7 @@ click-repl==0.3.0 # celery codecov==2.1.13 # via -r requirements/ci.in -commonground-api-common @ git+https://github.com/maykinmedia/commonground-api-common@feature/update-notifs-client +commonground-api-common==2.0.1 # via # -r requirements/base.txt # open-api-framework @@ -165,7 +165,6 @@ django==4.2.15 # notifications-api-common # open-api-framework # zgw-consumers - # zgw-consumers-oas django-admin-index==3.1.1 # via # -r requirements/base.txt @@ -327,10 +326,7 @@ face==20.1.1 factory-boy==3.3.0 # via -r requirements/test-tools.in faker==32.1.0 - # via - # -r requirements/base.txt - # factory-boy - # zgw-consumers-oas + # via factory-boy flake8==7.1.0 # via -r requirements/test-tools.in flower==2.0.1 @@ -536,7 +532,6 @@ pyyaml==6.0.1 # drf-yasg # oyaml # vcrpy - # zgw-consumers-oas qrcode==7.4.2 # via # -r requirements/base.txt @@ -566,7 +561,10 @@ requests==2.32.3 # sphinx # zgw-consumers requests-mock==1.12.1 - # via -r requirements/test-tools.in + # via + # -r requirements/base.txt + # -r requirements/test-tools.in + # commonground-api-common rpds-py==0.19.1 # via # -r requirements/base.txt @@ -634,7 +632,6 @@ typing-extensions==4.12.2 # mozilla-django-oidc-db # qrcode # zgw-consumers - # zgw-consumers-oas tzdata==2024.1 # via # -r requirements/base.txt @@ -696,7 +693,3 @@ zgw-consumers==0.35.1 # commonground-api-common # notifications-api-common # open-api-framework -zgw-consumers-oas==1.0.0 - # via - # -r requirements/base.txt - # commonground-api-common diff --git a/requirements/dev.txt b/requirements/dev.txt index b92e41a5..8045442f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -102,7 +102,7 @@ click-repl==0.3.0 # via # -r requirements/base.txt # celery -commonground-api-common @ git+https://github.com/maykinmedia/commonground-api-common@feature/update-notifs-client +commonground-api-common==2.0.1 # via # -r requirements/base.txt # open-api-framework @@ -168,7 +168,6 @@ django==4.2.15 # notifications-api-common # open-api-framework # zgw-consumers - # zgw-consumers-oas django-admin-index==3.1.1 # via # -r requirements/base.txt @@ -334,10 +333,7 @@ face==20.1.1 factory-boy==3.3.0 # via -r requirements/test-tools.in faker==32.1.0 - # via - # -r requirements/base.txt - # factory-boy - # zgw-consumers-oas + # via factory-boy flake8==7.1.0 # via -r requirements/test-tools.in flower==2.0.1 @@ -547,7 +543,6 @@ pyyaml==6.0.1 # drf-yasg # oyaml # vcrpy - # zgw-consumers-oas qrcode==7.4.2 # via # -r requirements/base.txt @@ -576,7 +571,10 @@ requests==2.32.3 # sphinx # zgw-consumers requests-mock==1.12.1 - # via -r requirements/test-tools.in + # via + # -r requirements/base.txt + # -r requirements/test-tools.in + # commonground-api-common rpds-py==0.19.1 # via # -r requirements/base.txt @@ -647,7 +645,6 @@ typing-extensions==4.12.2 # mozilla-django-oidc-db # qrcode # zgw-consumers - # zgw-consumers-oas tzdata==2024.1 # via # -r requirements/base.txt @@ -711,10 +708,6 @@ zgw-consumers==0.35.1 # commonground-api-common # notifications-api-common # open-api-framework -zgw-consumers-oas==1.0.0 - # via - # -r requirements/base.txt - # commonground-api-common # The following packages are considered to be unsafe in a requirements file: # pip From a96a89261d85dca88d95ffe81fb10465393c4b0f Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Fri, 29 Nov 2024 15:04:26 +0100 Subject: [PATCH 3/5] [#66] pin commonground-api-common to latest version --- requirements/base.in | 2 -- requirements/base.txt | 8 +++----- requirements/ci.txt | 4 ++-- requirements/dev.txt | 4 ++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index a2eb6ad6..d764f73a 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,3 +1 @@ open-api-framework - -commonground-api-common>=2.0.1 diff --git a/requirements/base.txt b/requirements/base.txt index 2cd8e103..c4f67934 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -59,10 +59,8 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -commonground-api-common==2.0.1 - # via - # -r requirements/base.in - # open-api-framework +commonground-api-common==2.1.0 + # via open-api-framework coreapi==2.3.3 # via commonground-api-common coreschema==0.0.4 @@ -236,7 +234,7 @@ mozilla-django-oidc==4.0.1 # via mozilla-django-oidc-db mozilla-django-oidc-db==0.19.0 # via open-api-framework -notifications-api-common==0.3.0 +notifications-api-common==0.3.1 # via commonground-api-common open-api-framework==0.9.0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index be5ed3bf..306f99eb 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -99,7 +99,7 @@ click-repl==0.3.0 # celery codecov==2.1.13 # via -r requirements/ci.in -commonground-api-common==2.0.1 +commonground-api-common==2.1.0 # via # -r requirements/base.txt # open-api-framework @@ -426,7 +426,7 @@ multidict==6.0.5 # via yarl mypy-extensions==1.0.0 # via black -notifications-api-common==0.3.0 +notifications-api-common==0.3.1 # via # -r requirements/base.txt # commonground-api-common diff --git a/requirements/dev.txt b/requirements/dev.txt index 8045442f..9c90af69 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -102,7 +102,7 @@ click-repl==0.3.0 # via # -r requirements/base.txt # celery -commonground-api-common==2.0.1 +commonground-api-common==2.1.0 # via # -r requirements/base.txt # open-api-framework @@ -435,7 +435,7 @@ multidict==6.0.5 # via yarl mypy-extensions==1.0.0 # via black -notifications-api-common==0.3.0 +notifications-api-common==0.3.1 # via # -r requirements/base.txt # commonground-api-common From e335333784160b0578e61280c17723c9618bc454 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Fri, 29 Nov 2024 15:07:15 +0100 Subject: [PATCH 4/5] [#66] regenerate spec --- src/openklant/components/klantinteracties/openapi.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/openklant/components/klantinteracties/openapi.yaml b/src/openklant/components/klantinteracties/openapi.yaml index 68e0fff1..83e285f6 100644 --- a/src/openklant/components/klantinteracties/openapi.yaml +++ b/src/openklant/components/klantinteracties/openapi.yaml @@ -3510,7 +3510,6 @@ components: maxLength: 40 required: - adres - - omschrijving - soortDigitaalAdres - url - uuid From 058325b609973b8e79f28babaaffe54b5474c3f7 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Fri, 29 Nov 2024 16:50:46 +0100 Subject: [PATCH 5/5] [#66] add fix for zgw-consumers-oas import --- requirements/base.txt | 2 +- requirements/ci.txt | 2 +- requirements/dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index c4f67934..b5c91437 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -59,7 +59,7 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -commonground-api-common==2.1.0 +commonground-api-common==2.1.2 # via open-api-framework coreapi==2.3.3 # via commonground-api-common diff --git a/requirements/ci.txt b/requirements/ci.txt index 306f99eb..16fc8657 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -99,7 +99,7 @@ click-repl==0.3.0 # celery codecov==2.1.13 # via -r requirements/ci.in -commonground-api-common==2.1.0 +commonground-api-common==2.1.2 # via # -r requirements/base.txt # open-api-framework diff --git a/requirements/dev.txt b/requirements/dev.txt index 9c90af69..8654db17 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -102,7 +102,7 @@ click-repl==0.3.0 # via # -r requirements/base.txt # celery -commonground-api-common==2.1.0 +commonground-api-common==2.1.2 # via # -r requirements/base.txt # open-api-framework