From 1937cebf40527012a7bfcc90fefe0154ee3552e5 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Tue, 30 Jan 2024 14:09:53 +0100 Subject: [PATCH] :heavy_plus_sign: Recompile dependencies with new open-api-framework version --- requirements/base.in | 3 +-- requirements/base.txt | 40 ++++++++++++++++++++++++++++---- requirements/ci.txt | 53 ++++++++++++++++++++++++++++++++++++++++++- requirements/dev.txt | 53 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 141 insertions(+), 8 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 13b86f6c..37a208a4 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,4 +1,4 @@ -git+https://github.com/maykinmedia/open-api-framework@bada78b0ad5c7479ab42a1377c046c7d7b176b5a +git+https://github.com/maykinmedia/open-api-framework@feature/more-dependencies # Core python libraries jsonschema @@ -10,5 +10,4 @@ maykin-django-two-factor-auth[phonenumbers] sharing-configs # API libraries -django-filter drf-nested-routers diff --git a/requirements/base.txt b/requirements/base.txt index 985883bc..39ff2501 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -7,7 +7,9 @@ amqp==5.1.1 # via kombu asgiref==3.6.0 - # via django + # via + # django + # django-cors-headers async-timeout==4.0.2 # via redis attrs==23.1.0 @@ -16,12 +18,15 @@ attrs==23.1.0 # jsonschema billiard==3.6.4.0 # via celery +bleach==6.1.0 + # via open-api-framework boltons==23.0.0 # via # face # glom celery==5.2.7 # via + # flower # notifications-api-common # open-api-framework certifi==2023.5.7 @@ -67,10 +72,12 @@ django==3.2.23 # commonground-api-common # django-admin-index # django-axes + # django-cors-headers # django-filter # django-formtools # django-jsonform # django-jsonsuit + # django-markup # django-otp # django-phonenumber-field # django-privates @@ -81,6 +88,7 @@ django==3.2.23 # django-simple-certmanager # django-solo # djangorestframework + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg @@ -95,16 +103,22 @@ django-admin-index==3.1.0 # via open-api-framework django-axes==6.3.0 # via open-api-framework +django-cors-headers==4.3.1 + # via open-api-framework django-filter==23.2 # via - # -r requirements/base.in # commonground-api-common + # open-api-framework django-formtools==2.4.1 # via maykin-django-two-factor-auth django-jsonform==2.21.5 - # via mozilla-django-oidc-db + # via + # mozilla-django-oidc-db + # open-api-framework django-jsonsuit==0.5.0 # via -r requirements/base.in +django-markup==1.8.1 + # via open-api-framework django-ordered-model==3.7.4 # via django-admin-index django-otp==1.2.0 @@ -133,6 +147,8 @@ django-solo==2.0.0 djangorestframework==3.12.4 # via # commonground-api-common + # djangorestframework-gis + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg @@ -142,6 +158,10 @@ djangorestframework-camel-case==1.4.2 # via # commonground-api-common # notifications-api-common +djangorestframework-gis==1.0 + # via open-api-framework +djangorestframework-inclusions==1.2.0 + # via open-api-framework drf-nested-routers==0.93.4 # via # -r requirements/base.in @@ -158,6 +178,8 @@ face==20.1.1 # via glom faker==18.9.0 # via zgw-consumers +flower==2.0.1 + # via open-api-framework gemma-zds-client==2.0.0 # via # commonground-api-common @@ -165,6 +187,8 @@ gemma-zds-client==2.0.0 # zgw-consumers glom==23.3.0 # via mozilla-django-oidc-db +humanize==4.9.0 + # via flower idna==3.4 # via requests inflection==0.5.1 @@ -197,7 +221,7 @@ mozilla-django-oidc-db==0.14.1 # via open-api-framework notifications-api-common==0.2.2 # via commonground-api-common -open_api_framework @ git+https://github.com/maykinmedia/open-api-framework@bada78b0ad5c7479ab42a1377c046c7d7b176b5a +open_api_framework @ git+https://github.com/maykinmedia/open-api-framework@feature/more-dependencies # via -r requirements/base.in oyaml==1.0 # via commonground-api-common @@ -205,6 +229,8 @@ packaging==23.1 # via drf-yasg phonenumbers==8.13.11 # via maykin-django-two-factor-auth +prometheus-client==0.19.0 + # via flower prompt-toolkit==3.0.38 # via click-repl psycopg2==2.9.9 @@ -235,6 +261,7 @@ pytz==2023.3 # celery # django # drf-yasg + # flower pyyaml==6.0 # via # commonground-api-common @@ -267,6 +294,7 @@ sharing-configs==0.1.2 # via -r requirements/base.in six==1.16.0 # via + # bleach # click-repl # isodate # python-dateutil @@ -274,6 +302,8 @@ six==1.16.0 # requests-mock sqlparse==0.4.4 # via django +tornado==6.4 + # via flower typing-extensions==4.9.0 # via drf-spectacular uritemplate==4.1.1 @@ -295,6 +325,8 @@ vine==5.0.0 # kombu wcwidth==0.2.6 # via prompt-toolkit +webencodings==0.5.1 + # via bleach wrapt==1.14.1 # via elastic-apm zgw-consumers==0.27.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index 307efe4f..7f5b4ca7 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -12,6 +12,7 @@ asgiref==3.6.0 # via # -r requirements/base.txt # django + # django-cors-headers async-timeout==4.0.2 # via # -r requirements/base.txt @@ -27,6 +28,10 @@ billiard==3.6.4.0 # via # -r requirements/base.txt # celery +bleach==6.1.0 + # via + # -r requirements/base.txt + # open-api-framework boltons==23.0.0 # via # -r requirements/base.txt @@ -35,6 +40,7 @@ boltons==23.0.0 celery==5.2.7 # via # -r requirements/base.txt + # flower # notifications-api-common # open-api-framework certifi==2023.5.7 @@ -102,11 +108,13 @@ django==3.2.23 # commonground-api-common # django-admin-index # django-axes + # django-cors-headers # django-filter # django-formtools # django-jenkins # django-jsonform # django-jsonsuit + # django-markup # django-otp # django-phonenumber-field # django-privates @@ -117,6 +125,7 @@ django==3.2.23 # django-simple-certmanager # django-solo # djangorestframework + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg @@ -135,10 +144,15 @@ django-axes==6.3.0 # via # -r requirements/base.txt # open-api-framework +django-cors-headers==4.3.1 + # via + # -r requirements/base.txt + # open-api-framework django-filter==23.2 # via # -r requirements/base.txt # commonground-api-common + # open-api-framework django-formtools==2.4.1 # via # -r requirements/base.txt @@ -149,8 +163,13 @@ django-jsonform==2.21.5 # via # -r requirements/base.txt # mozilla-django-oidc-db + # open-api-framework django-jsonsuit==0.5.0 # via -r requirements/base.txt +django-markup==1.8.1 + # via + # -r requirements/base.txt + # open-api-framework django-ordered-model==3.7.4 # via # -r requirements/base.txt @@ -201,6 +220,8 @@ djangorestframework==3.12.4 # via # -r requirements/base.txt # commonground-api-common + # djangorestframework-gis + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg @@ -211,6 +232,14 @@ djangorestframework-camel-case==1.4.2 # -r requirements/base.txt # commonground-api-common # notifications-api-common +djangorestframework-gis==1.0 + # via + # -r requirements/base.txt + # open-api-framework +djangorestframework-inclusions==1.2.0 + # via + # -r requirements/base.txt + # open-api-framework drf-nested-routers==0.93.4 # via # -r requirements/base.txt @@ -242,6 +271,10 @@ faker==18.9.0 # -r requirements/base.txt # factory-boy # zgw-consumers +flower==2.0.1 + # via + # -r requirements/base.txt + # open-api-framework freezegun==1.2.2 # via -r requirements/test-tools.in gemma-zds-client==2.0.0 @@ -254,6 +287,10 @@ glom==23.3.0 # via # -r requirements/base.txt # mozilla-django-oidc-db +humanize==4.9.0 + # via + # -r requirements/base.txt + # flower idna==3.4 # via # -r requirements/base.txt @@ -311,7 +348,7 @@ notifications-api-common==0.2.2 # via # -r requirements/base.txt # commonground-api-common -open_api_framework @ git+https://github.com/maykinmedia/open-api-framework@bada78b0ad5c7479ab42a1377c046c7d7b176b5a +open_api_framework @ git+https://github.com/maykinmedia/open-api-framework@feature/more-dependencies # via -r requirements/base.txt oyaml==1.0 # via @@ -325,6 +362,10 @@ phonenumbers==8.13.11 # via # -r requirements/base.txt # maykin-django-two-factor-auth +prometheus-client==0.19.0 + # via + # -r requirements/base.txt + # flower prompt-toolkit==3.0.38 # via # -r requirements/base.txt @@ -374,6 +415,7 @@ pytz==2023.3 # celery # django # drf-yasg + # flower pyyaml==6.0 # via # -r requirements/base.txt @@ -422,6 +464,7 @@ sharing-configs==0.1.2 six==1.16.0 # via # -r requirements/base.txt + # bleach # click-repl # isodate # python-dateutil @@ -435,6 +478,10 @@ sqlparse==0.4.4 # django tblib==1.7.0 # via -r requirements/test-tools.in +tornado==6.4 + # via + # -r requirements/base.txt + # flower typing-extensions==4.9.0 # via # -r requirements/base.txt @@ -467,6 +514,10 @@ wcwidth==0.2.6 # via # -r requirements/base.txt # prompt-toolkit +webencodings==0.5.1 + # via + # -r requirements/base.txt + # bleach webob==1.8.7 # via webtest webtest==3.0.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index d08992a0..936efbe5 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -14,6 +14,7 @@ asgiref==3.6.0 # via # -r requirements/ci.txt # django + # django-cors-headers async-timeout==4.0.2 # via # -r requirements/ci.txt @@ -35,6 +36,10 @@ billiard==3.6.4.0 # celery black==23.3.0 # via -r requirements/dev.in +bleach==6.1.0 + # via + # -r requirements/ci.txt + # open-api-framework boltons==23.0.0 # via # -r requirements/ci.txt @@ -49,6 +54,7 @@ bumpversion==0.6.0 celery==5.2.7 # via # -r requirements/ci.txt + # flower # notifications-api-common # open-api-framework certifi==2023.5.7 @@ -120,6 +126,7 @@ django==3.2.23 # commonground-api-common # django-admin-index # django-axes + # django-cors-headers # django-debug-toolbar # django-extensions # django-filter @@ -127,6 +134,7 @@ django==3.2.23 # django-jenkins # django-jsonform # django-jsonsuit + # django-markup # django-otp # django-phonenumber-field # django-privates @@ -137,6 +145,7 @@ django==3.2.23 # django-simple-certmanager # django-solo # djangorestframework + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg @@ -155,6 +164,10 @@ django-axes==6.3.0 # via # -r requirements/ci.txt # open-api-framework +django-cors-headers==4.3.1 + # via + # -r requirements/ci.txt + # open-api-framework django-debug-toolbar==4.1.0 # via -r requirements/dev.in django-extensions==3.2.1 @@ -163,6 +176,7 @@ django-filter==23.2 # via # -r requirements/ci.txt # commonground-api-common + # open-api-framework django-formtools==2.4.1 # via # -r requirements/ci.txt @@ -173,8 +187,13 @@ django-jsonform==2.21.5 # via # -r requirements/ci.txt # mozilla-django-oidc-db + # open-api-framework django-jsonsuit==0.5.0 # via -r requirements/ci.txt +django-markup==1.8.1 + # via + # -r requirements/ci.txt + # open-api-framework django-ordered-model==3.7.4 # via # -r requirements/ci.txt @@ -225,6 +244,8 @@ djangorestframework==3.12.4 # via # -r requirements/ci.txt # commonground-api-common + # djangorestframework-gis + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg @@ -235,6 +256,14 @@ djangorestframework-camel-case==1.4.2 # -r requirements/ci.txt # commonground-api-common # notifications-api-common +djangorestframework-gis==1.0 + # via + # -r requirements/ci.txt + # open-api-framework +djangorestframework-inclusions==1.2.0 + # via + # -r requirements/ci.txt + # open-api-framework docutils==0.18.1 # via # sphinx @@ -272,6 +301,10 @@ faker==18.9.0 # zgw-consumers flake8==6.0.0 # via -r requirements/dev.in +flower==2.0.1 + # via + # -r requirements/ci.txt + # open-api-framework freezegun==1.2.2 # via -r requirements/ci.txt gemma-zds-client==2.0.0 @@ -284,6 +317,10 @@ glom==23.3.0 # via # -r requirements/ci.txt # mozilla-django-oidc-db +humanize==4.9.0 + # via + # -r requirements/ci.txt + # flower idna==3.4 # via # -r requirements/ci.txt @@ -354,7 +391,7 @@ notifications-api-common==0.2.2 # via # -r requirements/ci.txt # commonground-api-common -open_api_framework @ git+https://github.com/maykinmedia/open-api-framework@bada78b0ad5c7479ab42a1377c046c7d7b176b5a +open_api_framework @ git+https://github.com/maykinmedia/open-api-framework@feature/more-dependencies # via -r requirements/ci.txt oyaml==1.0 # via @@ -377,6 +414,10 @@ pip-tools==6.13.0 # via -r requirements/dev.in platformdirs==3.5.1 # via black +prometheus-client==0.19.0 + # via + # -r requirements/ci.txt + # flower prompt-toolkit==3.0.38 # via # -r requirements/ci.txt @@ -434,6 +475,7 @@ pytz==2023.3 # celery # django # drf-yasg + # flower pyyaml==6.0 # via # -r requirements/ci.txt @@ -482,6 +524,7 @@ sharing-configs==0.1.2 six==1.16.0 # via # -r requirements/ci.txt + # bleach # click-repl # isodate # python-dateutil @@ -525,6 +568,10 @@ tomli==2.0.1 # via # black # build +tornado==6.4 + # via + # -r requirements/ci.txt + # flower typing-extensions==4.9.0 # via # -r requirements/ci.txt @@ -560,6 +607,10 @@ wcwidth==0.2.6 # via # -r requirements/ci.txt # prompt-toolkit +webencodings==0.5.1 + # via + # -r requirements/ci.txt + # bleach webob==1.8.7 # via # -r requirements/ci.txt