diff --git a/requirements/base.in b/requirements/base.in index 561bdd21..6dc9fe64 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,31 +1,9 @@ +open-api-framework + # Core python libraries glom # data represenation based on spec -psycopg2 # database driver -python-dotenv # environment variables for secrets -python-decouple # processing of envvar configs jsonschema # Framework libraries -django~=3.2 -django-admin-index -django-axes -django-redis maykin-django-two-factor-auth maykin-django-two-factor-auth[phonenumbers] -mozilla-django-oidc-db - -# API libraries -djangorestframework -djangorestframework-gis -# django-extra-fields -django-filter -drf-spectacular # api documentation - -# WSGI servers & monitoring - production oriented -uwsgi -sentry-sdk # error monitoring -elastic-apm # Elastic APM integration - -# Common ground libraries -commonground-api-common[markdown_docs]>=1.6.4 -zgw-consumers # external api auths diff --git a/requirements/base.txt b/requirements/base.txt index f3b6c012..9b98e5af 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -7,19 +7,26 @@ amqp==5.2.0 # via kombu asgiref==3.7.2 - # via django + # via + # django + # django-cors-headers attrs==20.3.0 # via # glom # jsonschema billiard==3.6.4.0 # via celery +bleach==6.1.0 + # via open-api-framework boltons==21.0.0 # via # face # glom -celery==5.2.2 - # via notifications-api-common +celery==5.2.7 + # via + # flower + # notifications-api-common + # open-api-framework certifi==2020.12.5 # via # django-simple-certmanager @@ -42,10 +49,8 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -commonground-api-common[markdown-docs]==1.12.1 - # via - # -r requirements/base.in - # commonground-api-common +commonground-api-common==1.12.1 + # via open-api-framework coreapi==2.3.3 # via # commonground-api-common @@ -62,10 +67,10 @@ cryptography==41.0.7 # pyopenssl django==3.2.23 # via - # -r requirements/base.in # commonground-api-common # django-admin-index # django-axes + # django-cors-headers # django-filter # django-formtools # django-jsonform @@ -80,6 +85,7 @@ django==3.2.23 # django-simple-certmanager # django-solo # djangorestframework + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg @@ -87,21 +93,26 @@ django==3.2.23 # mozilla-django-oidc # mozilla-django-oidc-db # notifications-api-common + # open-api-framework # zgw-consumers django-admin-index==3.1.0 - # via -r requirements/base.in + # via open-api-framework django-axes==6.3.0 - # via -r requirements/base.in + # 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.3 # via maykin-django-two-factor-auth django-jsonform==2.21.4 - # via mozilla-django-oidc-db -django-markup==1.3 - # via commonground-api-common + # via + # mozilla-django-oidc-db + # open-api-framework +django-markup==1.8.1 + # via open-api-framework django-ordered-model==3.7.4 # via django-admin-index django-otp==1.0.6 @@ -111,7 +122,7 @@ django-phonenumber-field==5.2.0 django-privates==2.0.0.post0 # via django-simple-certmanager django-redis==5.4.0 - # via -r requirements/base.in + # via open-api-framework django-relativedelta==2.0.0 # via zgw-consumers django-rest-framework-condition==0.1.1 @@ -128,33 +139,38 @@ django-solo==2.2.0 # zgw-consumers djangorestframework==3.12.4 # via - # -r requirements/base.in # commonground-api-common # djangorestframework-gis + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg # notifications-api-common + # open-api-framework djangorestframework-camel-case==1.2.0 # via # commonground-api-common # notifications-api-common djangorestframework-gis==1.0 - # via -r requirements/base.in + # via open-api-framework +djangorestframework-inclusions==1.2.0 + # via open-api-framework drf-nested-routers==0.93.3 # via commonground-api-common drf-spectacular==0.27.0 - # via -r requirements/base.in + # via open-api-framework drf-yasg==1.20.0 # via commonground-api-common ecs-logging==2.1.0 # via elastic-apm elastic-apm==6.20.0 - # via -r requirements/base.in + # via open-api-framework face==20.1.1 # via glom faker==8.1.0 # via zgw-consumers +flower==2.0.1 + # via open-api-framework gemma-zds-client==1.0.1 # via # commonground-api-common @@ -164,6 +180,8 @@ glom==23.5.0 # via # -r requirements/base.in # mozilla-django-oidc-db +humanize==4.9.0 + # via flower idna==2.10 # via requests inflection==0.5.1 @@ -186,8 +204,6 @@ jsonschema==3.2.0 # drf-spectacular kombu==5.3.5 # via celery -markdown==3.3.4 - # via commonground-api-common markupsafe==2.1.3 # via jinja2 maykin-django-two-factor-auth[phonenumbers]==2.0.3 @@ -195,19 +211,23 @@ maykin-django-two-factor-auth[phonenumbers]==2.0.3 mozilla-django-oidc==4.0.0 # via mozilla-django-oidc-db mozilla-django-oidc-db==0.14.1 - # via -r requirements/base.in + # via open-api-framework notifications-api-common==0.2.2 # via commonground-api-common +open-api-framework==0.1.0 + # via -r requirements/base.in oyaml==1.0 # via commonground-api-common packaging==23.2 # via drf-yasg phonenumbers==8.12.29 # via maykin-django-two-factor-auth +prometheus-client==0.19.0 + # via flower prompt-toolkit==3.0.43 # via click-repl psycopg2==2.9.9 - # via -r requirements/base.in + # via open-api-framework pycparser==2.20 # via cffi pyjwt==2.4.0 @@ -226,13 +246,14 @@ python-dateutil==2.8.1 # django-relativedelta # faker python-decouple==3.8 - # via -r requirements/base.in + # via open-api-framework python-dotenv==1.0.0 - # via -r requirements/base.in -pytz==2021.1 + # via open-api-framework +pytz==2024.1 # via # celery # django + # flower pyyaml==6.0.1 # via # commonground-api-common @@ -249,17 +270,18 @@ requests==2.31.0 # coreapi # gemma-zds-client # mozilla-django-oidc + # open-api-framework # requests-mock # zgw-consumers requests-mock==1.8.0 # via zgw-consumers ruamel-yaml==0.17.4 # via drf-yasg -sentry-sdk==1.9.0 - # via -r requirements/base.in +sentry-sdk==1.40.0 + # via open-api-framework six==1.15.0 # via - # django-markup + # bleach # isodate # jsonschema # python-dateutil @@ -269,6 +291,8 @@ sqlparse==0.4.2 # via django text-unidecode==1.3 # via faker +tornado==6.4 + # via flower typing-extensions==4.9.0 # via asgiref uritemplate==3.0.1 @@ -276,13 +300,13 @@ uritemplate==3.0.1 # coreapi # drf-spectacular # drf-yasg -urllib3==1.26.6 +urllib3==2.2.0 # via # elastic-apm # requests # sentry-sdk uwsgi==2.0.23 - # via -r requirements/base.in + # via open-api-framework vine==5.1.0 # via # amqp @@ -290,12 +314,14 @@ vine==5.1.0 # kombu wcwidth==0.2.13 # via prompt-toolkit +webencodings==0.5.1 + # via bleach wrapt==1.14.1 # via elastic-apm zgw-consumers==0.27.0 # via - # -r requirements/base.in # notifications-api-common + # open-api-framework # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/ci.txt b/requirements/ci.txt index 004600e2..aa398fa6 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -12,6 +12,7 @@ asgiref==3.7.2 # via # -r requirements/base.txt # django + # django-cors-headers attrs==20.3.0 # via # -r requirements/base.txt @@ -23,15 +24,21 @@ billiard==3.6.4.0 # via # -r requirements/base.txt # celery +bleach==6.1.0 + # via + # -r requirements/base.txt + # open-api-framework boltons==21.0.0 # via # -r requirements/base.txt # face # glom -celery==5.2.2 +celery==5.2.7 # via # -r requirements/base.txt + # flower # notifications-api-common + # open-api-framework certifi==2020.12.5 # via # -r requirements/base.txt @@ -66,10 +73,10 @@ click-repl==0.3.0 # via # -r requirements/base.txt # celery -commonground-api-common[markdown-docs]==1.12.1 +commonground-api-common==1.12.1 # via # -r requirements/base.txt - # commonground-api-common + # open-api-framework coreapi==2.3.3 # via # -r requirements/base.txt @@ -97,6 +104,7 @@ django==3.2.23 # commonground-api-common # django-admin-index # django-axes + # django-cors-headers # django-filter # django-formtools # django-jsonform @@ -111,6 +119,7 @@ django==3.2.23 # django-simple-certmanager # django-solo # djangorestframework + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg @@ -118,15 +127,25 @@ django==3.2.23 # mozilla-django-oidc # mozilla-django-oidc-db # notifications-api-common + # open-api-framework # zgw-consumers django-admin-index==3.1.0 - # via -r requirements/base.txt + # via + # -r requirements/base.txt + # open-api-framework django-axes==6.3.0 - # via -r requirements/base.txt + # 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.3 # via # -r requirements/base.txt @@ -135,8 +154,11 @@ django-jsonform==2.21.4 # via # -r requirements/base.txt # mozilla-django-oidc-db -django-markup==1.3 - # via -r requirements/base.txt + # open-api-framework +django-markup==1.8.1 + # via + # -r requirements/base.txt + # open-api-framework django-ordered-model==3.7.4 # via # -r requirements/base.txt @@ -154,7 +176,9 @@ django-privates==2.0.0.post0 # -r requirements/base.txt # django-simple-certmanager django-redis==5.4.0 - # via -r requirements/base.txt + # via + # -r requirements/base.txt + # open-api-framework django-relativedelta==2.0.0 # via # -r requirements/base.txt @@ -185,23 +209,33 @@ djangorestframework==3.12.4 # -r requirements/base.txt # commonground-api-common # djangorestframework-gis + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg # notifications-api-common + # open-api-framework djangorestframework-camel-case==1.2.0 # via # -r requirements/base.txt # commonground-api-common # notifications-api-common djangorestframework-gis==1.0 - # via -r requirements/base.txt + # 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.3 # via # -r requirements/base.txt # commonground-api-common drf-spectacular==0.27.0 - # via -r requirements/base.txt + # via + # -r requirements/base.txt + # open-api-framework drf-yasg==1.20.0 # via # -r requirements/base.txt @@ -211,7 +245,9 @@ ecs-logging==2.1.0 # -r requirements/base.txt # elastic-apm elastic-apm==6.20.0 - # via -r requirements/base.txt + # via + # -r requirements/base.txt + # open-api-framework face==20.1.1 # via # -r requirements/base.txt @@ -223,6 +259,10 @@ faker==8.1.0 # -r requirements/base.txt # factory-boy # zgw-consumers +flower==2.0.1 + # via + # -r requirements/base.txt + # open-api-framework freezegun==1.1.0 # via -r requirements/test-tools.in gemma-zds-client==1.0.1 @@ -235,6 +275,10 @@ glom==23.5.0 # via # -r requirements/base.txt # mozilla-django-oidc-db +humanize==4.9.0 + # via + # -r requirements/base.txt + # flower idna==2.10 # via # -r requirements/base.txt @@ -274,8 +318,6 @@ kombu==5.3.5 # celery lxml==4.7.1 # via pyquery -markdown==3.3.4 - # via -r requirements/base.txt markupsafe==2.1.3 # via # -r requirements/base.txt @@ -289,11 +331,15 @@ mozilla-django-oidc==4.0.0 # -r requirements/base.txt # mozilla-django-oidc-db mozilla-django-oidc-db==0.14.1 - # via -r requirements/base.txt + # via + # -r requirements/base.txt + # open-api-framework notifications-api-common==0.2.2 # via # -r requirements/base.txt # commonground-api-common +open-api-framework==0.1.0 + # via -r requirements/base.txt oyaml==1.0 # via # -r requirements/base.txt @@ -306,12 +352,18 @@ phonenumbers==8.12.29 # 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.43 # via # -r requirements/base.txt # click-repl psycopg2==2.9.9 - # via -r requirements/base.txt + # via + # -r requirements/base.txt + # open-api-framework pycparser==2.20 # via # -r requirements/base.txt @@ -340,14 +392,19 @@ python-dateutil==2.8.1 # faker # freezegun python-decouple==3.8 - # via -r requirements/base.txt + # via + # -r requirements/base.txt + # open-api-framework python-dotenv==1.0.0 - # via -r requirements/base.txt -pytz==2021.1 + # via + # -r requirements/base.txt + # open-api-framework +pytz==2024.1 # via # -r requirements/base.txt # celery # django + # flower pyyaml==6.0.1 # via # -r requirements/base.txt @@ -370,6 +427,7 @@ requests==2.31.0 # coreapi # gemma-zds-client # mozilla-django-oidc + # open-api-framework # requests-mock # zgw-consumers requests-mock==1.8.0 @@ -381,12 +439,14 @@ ruamel-yaml==0.17.4 # via # -r requirements/base.txt # drf-yasg -sentry-sdk==1.9.0 - # via -r requirements/base.txt +sentry-sdk==1.40.0 + # via + # -r requirements/base.txt + # open-api-framework six==1.15.0 # via # -r requirements/base.txt - # django-markup + # bleach # isodate # jsonschema # python-dateutil @@ -405,6 +465,10 @@ text-unidecode==1.3 # via # -r requirements/base.txt # faker +tornado==6.4 + # via + # -r requirements/base.txt + # flower typing-extensions==4.9.0 # via # -r requirements/base.txt @@ -415,14 +479,16 @@ uritemplate==3.0.1 # coreapi # drf-spectacular # drf-yasg -urllib3==1.26.6 +urllib3==2.2.0 # via # -r requirements/base.txt # elastic-apm # requests # sentry-sdk uwsgi==2.0.23 - # via -r requirements/base.txt + # via + # -r requirements/base.txt + # open-api-framework vine==5.1.0 # via # -r requirements/base.txt @@ -435,6 +501,10 @@ wcwidth==0.2.13 # via # -r requirements/base.txt # prompt-toolkit +webencodings==0.5.1 + # via + # -r requirements/base.txt + # bleach webob==1.8.7 # via webtest webtest==2.0.35 @@ -447,6 +517,7 @@ zgw-consumers==0.27.0 # via # -r requirements/base.txt # notifications-api-common + # open-api-framework # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/dev.txt b/requirements/dev.txt index 39eae4ef..34e81791 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -14,6 +14,7 @@ asgiref==3.7.2 # via # -r requirements/ci.txt # django + # django-cors-headers attrs==20.3.0 # via # -r requirements/ci.txt @@ -31,6 +32,10 @@ billiard==3.6.4.0 # celery black==23.12.1 # via -r requirements/dev.in +bleach==6.1.0 + # via + # -r requirements/ci.txt + # open-api-framework boltons==21.0.0 # via # -r requirements/ci.txt @@ -42,10 +47,12 @@ bump2version==1.0.1 # via bumpversion bumpversion==0.6.0 # via -r requirements/dev.in -celery==5.2.2 +celery==5.2.7 # via # -r requirements/ci.txt + # flower # notifications-api-common + # open-api-framework certifi==2020.12.5 # via # -r requirements/ci.txt @@ -82,10 +89,10 @@ click-repl==0.3.0 # via # -r requirements/ci.txt # celery -commonground-api-common[markdown-docs]==1.12.1 +commonground-api-common==1.12.1 # via # -r requirements/ci.txt - # commonground-api-common + # open-api-framework commonmark==0.9.1 # via recommonmark coreapi==2.3.3 @@ -117,6 +124,7 @@ django==3.2.23 # commonground-api-common # django-admin-index # django-axes + # django-cors-headers # django-debug-toolbar # django-extensions # django-filter @@ -133,6 +141,7 @@ django==3.2.23 # django-simple-certmanager # django-solo # djangorestframework + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg @@ -140,11 +149,20 @@ django==3.2.23 # mozilla-django-oidc # mozilla-django-oidc-db # notifications-api-common + # open-api-framework # zgw-consumers django-admin-index==3.1.0 - # via -r requirements/ci.txt + # via + # -r requirements/ci.txt + # open-api-framework django-axes==6.3.0 - # via -r requirements/ci.txt + # 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.2.0 # via -r requirements/dev.in django-extensions==3.2.3 @@ -153,6 +171,7 @@ django-filter==23.2 # via # -r requirements/ci.txt # commonground-api-common + # open-api-framework django-formtools==2.3 # via # -r requirements/ci.txt @@ -161,8 +180,11 @@ django-jsonform==2.21.4 # via # -r requirements/ci.txt # mozilla-django-oidc-db -django-markup==1.3 - # via -r requirements/ci.txt + # open-api-framework +django-markup==1.8.1 + # via + # -r requirements/ci.txt + # open-api-framework django-ordered-model==3.7.4 # via # -r requirements/ci.txt @@ -180,7 +202,9 @@ django-privates==2.0.0.post0 # -r requirements/ci.txt # django-simple-certmanager django-redis==5.4.0 - # via -r requirements/ci.txt + # via + # -r requirements/ci.txt + # open-api-framework django-relativedelta==2.0.0 # via # -r requirements/ci.txt @@ -211,17 +235,25 @@ djangorestframework==3.12.4 # -r requirements/ci.txt # commonground-api-common # djangorestframework-gis + # djangorestframework-inclusions # drf-nested-routers # drf-spectacular # drf-yasg # notifications-api-common + # open-api-framework djangorestframework-camel-case==1.2.0 # via # -r requirements/ci.txt # commonground-api-common # notifications-api-common djangorestframework-gis==1.0 - # via -r requirements/ci.txt + # 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 # recommonmark @@ -233,7 +265,9 @@ drf-nested-routers==0.93.3 # -r requirements/ci.txt # commonground-api-common drf-spectacular==0.27.0 - # via -r requirements/ci.txt + # via + # -r requirements/ci.txt + # open-api-framework drf-yasg==1.20.0 # via # -r requirements/ci.txt @@ -243,7 +277,9 @@ ecs-logging==2.1.0 # -r requirements/ci.txt # elastic-apm elastic-apm==6.20.0 - # via -r requirements/ci.txt + # via + # -r requirements/ci.txt + # open-api-framework face==20.1.1 # via # -r requirements/ci.txt @@ -257,6 +293,10 @@ faker==8.1.0 # zgw-consumers flake8==7.0.0 # via -r requirements/dev.in +flower==2.0.1 + # via + # -r requirements/ci.txt + # open-api-framework freezegun==1.1.0 # via -r requirements/ci.txt gemma-zds-client==1.0.1 @@ -269,6 +309,10 @@ glom==23.5.0 # via # -r requirements/ci.txt # mozilla-django-oidc-db +humanize==4.9.0 + # via + # -r requirements/ci.txt + # flower idna==2.10 # via # -r requirements/ci.txt @@ -315,8 +359,6 @@ lxml==4.7.1 # via # -r requirements/ci.txt # pyquery -markdown==3.3.4 - # via -r requirements/ci.txt markupsafe==2.1.3 # via # -r requirements/ci.txt @@ -332,13 +374,17 @@ mozilla-django-oidc==4.0.0 # -r requirements/ci.txt # mozilla-django-oidc-db mozilla-django-oidc-db==0.14.1 - # via -r requirements/ci.txt + # via + # -r requirements/ci.txt + # open-api-framework mypy-extensions==0.4.3 # via black notifications-api-common==0.2.2 # via # -r requirements/ci.txt # commonground-api-common +open-api-framework==0.1.0 + # via -r requirements/ci.txt oyaml==1.0 # via # -r requirements/ci.txt @@ -360,12 +406,18 @@ pip-tools==7.3.0 # via -r requirements/dev.in platformdirs==4.0.0 # via black +prometheus-client==0.19.0 + # via + # -r requirements/ci.txt + # flower prompt-toolkit==3.0.43 # via # -r requirements/ci.txt # click-repl psycopg2==2.9.9 - # via -r requirements/ci.txt + # via + # -r requirements/ci.txt + # open-api-framework pycodestyle==2.11.1 # via flake8 pycparser==2.20 @@ -404,15 +456,20 @@ python-dateutil==2.8.1 # faker # freezegun python-decouple==3.8 - # via -r requirements/ci.txt + # via + # -r requirements/ci.txt + # open-api-framework python-dotenv==1.0.0 - # via -r requirements/ci.txt -pytz==2021.1 + # via + # -r requirements/ci.txt + # open-api-framework +pytz==2024.1 # via # -r requirements/ci.txt # babel # celery # django + # flower pyyaml==6.0.1 # via # -r requirements/ci.txt @@ -437,6 +494,7 @@ requests==2.31.0 # coreapi # gemma-zds-client # mozilla-django-oidc + # open-api-framework # requests-mock # sphinx # zgw-consumers @@ -448,12 +506,14 @@ ruamel-yaml==0.17.4 # via # -r requirements/ci.txt # drf-yasg -sentry-sdk==1.9.0 - # via -r requirements/ci.txt +sentry-sdk==1.40.0 + # via + # -r requirements/ci.txt + # open-api-framework six==1.15.0 # via # -r requirements/ci.txt - # django-markup + # bleach # isodate # jsonschema # python-dateutil @@ -508,6 +568,10 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks +tornado==6.4 + # via + # -r requirements/ci.txt + # flower typing-extensions==4.9.0 # via # -r requirements/ci.txt @@ -519,14 +583,16 @@ uritemplate==3.0.1 # coreapi # drf-spectacular # drf-yasg -urllib3==1.26.6 +urllib3==2.2.0 # via # -r requirements/ci.txt # elastic-apm # requests # sentry-sdk uwsgi==2.0.23 - # via -r requirements/ci.txt + # via + # -r requirements/ci.txt + # open-api-framework vine==5.1.0 # via # -r requirements/ci.txt @@ -541,6 +607,10 @@ wcwidth==0.2.13 # 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 @@ -559,6 +629,7 @@ zgw-consumers==0.27.0 # via # -r requirements/ci.txt # notifications-api-common + # open-api-framework # The following packages are considered to be unsafe in a requirements file: # pip