Merge pull request #358 from maykinmedia/feature/meta-package-deps

➕ Replace dependencies with open-api-dependencies

requirements/base.in

@@ -1,36 +1,8 @@
+open-api-framework
+
 # Core python libraries
-celery
 glom # data represenation based on spec
-Pillow  # handle images
-psycopg2  # database driver
-pytz  # handle timezones
-python-dotenv  # environment variables for secrets
-python-decouple  # processing of envvar configs
 jsonschema
 
-# Framework libraries
-django~=4.2
-django-admin-index
-django-axes
-django-redis
-django-rosetta
-maykin-2fa
-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
-flower # task monitoring
-
 # Common ground libraries
 notifications-api-common
-commonground-api-common[markdown_docs]
-zgw-consumers  # external api auths

requirements/base.txt

@@ -7,7 +7,9 @@
 amqp==5.2.0
     # via kombu
 asgiref==3.7.2
-    # via django
+    # via
+    #   django
+    #   django-cors-headers
 asn1crypto==1.5.1
     # via webauthn
 attrs==20.3.0
@@ -16,17 +18,19 @@ attrs==20.3.0
     #   jsonschema
 billiard==3.6.4.0
     # via celery
+bleach==6.1.0
+    # via open-api-framework
 boltons==21.0.0
     # via
     #   face
     #   glom
 cbor2==5.6.1
     # via webauthn
-celery==5.2.2
+celery==5.2.7
     # via
-    #   -r requirements/base.in
     #   flower
     #   notifications-api-common
+    #   open-api-framework
 certifi==2020.12.5
     # via
     #   django-simple-certmanager
@@ -35,7 +39,7 @@ certifi==2020.12.5
     #   sentry-sdk
 cffi==1.16.0
     # via cryptography
-chardet==4.0.0
+charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via
@@ -49,8 +53,8 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-commonground-api-common[markdown-docs,markdown_docs]==1.13.0
-    # via -r requirements/base.in
+commonground-api-common==1.13.0
+    # via open-api-framework
 coreapi==2.3.3
     # via commonground-api-common
 coreschema==0.0.4
@@ -64,10 +68,10 @@ cryptography==41.0.7
     #   webauthn
 django==4.2.11
     # via
-    #   -r requirements/base.in
     #   commonground-api-common
     #   django-admin-index
     #   django-axes
+    #   django-cors-headers
     #   django-filter
     #   django-formtools
     #   django-jsonform
@@ -78,34 +82,39 @@ django==4.2.11
     #   django-redis
     #   django-relativedelta
     #   django-rest-framework-condition
-    #   django-rosetta
     #   django-sendfile2
     #   django-simple-certmanager
     #   django-solo
     #   django-two-factor-auth
     #   djangorestframework
+    #   djangorestframework-inclusions
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-yasg
     #   maykin-2fa
     #   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.5
     # via
-    #   -r requirements/base.in
     #   commonground-api-common
+    #   open-api-framework
 django-formtools==2.3
     # via 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
@@ -115,13 +124,11 @@ 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
     # via commonground-api-common
-django-rosetta==0.9.8
-    # via -r requirements/base.in
 django-sendfile2==0.7.0
     # via django-privates
 django-simple-certmanager==1.4.1
@@ -136,33 +143,38 @@ django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
     # via maykin-2fa
 djangorestframework==3.14.0
     # 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.4.2
     # 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.26.5
-    # via -r requirements/base.in
+drf-spectacular==0.27.0
+    # via open-api-framework
 drf-yasg==1.21.7
     # via commonground-api-common
-elastic-apm==6.1.1
-    # via -r requirements/base.in
+ecs-logging==2.1.0
+    # via elastic-apm
+elastic-apm==6.20.0
+    # via open-api-framework
 face==20.1.1
     # via glom
 faker==8.1.0
     # via zgw-consumers
 flower==2.0.1
-    # via -r requirements/base.in
+    # via open-api-framework
 gemma-zds-client==1.0.1
     # via
     #   commonground-api-common
@@ -196,36 +208,32 @@ jsonschema==4.17.3
     #   drf-spectacular
 kombu==5.3.5
     # via celery
-markdown==3.5.2
-    # via commonground-api-common
 markupsafe==2.1.3
     # via jinja2
 maykin-2fa==1.0.0
-    # via -r requirements/base.in
+    # via open-api-framework
 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
     #   -r requirements/base.in
     #   commonground-api-common
+open-api-framework==0.2.0
+    # via -r requirements/base.in
 oyaml==1.0
     # via commonground-api-common
 packaging==23.2
     # via drf-yasg
 phonenumberslite==8.13.30
     # via django-two-factor-auth
-pillow==10.2.0
-    # via -r requirements/base.in
-polib==1.1.1
-    # via django-rosetta
 prometheus-client==0.20.0
     # via flower
 prompt-toolkit==3.0.43
     # via click-repl
-psycopg2==2.8.6
-    # via -r requirements/base.in
+psycopg2==2.9.9
+    # via open-api-framework
 pycparser==2.20
     # via cffi
 pyjwt==2.4.0
@@ -244,13 +252,12 @@ python-dateutil==2.8.1
     # via
     #   django-relativedelta
     #   faker
-python-decouple==3.4
-    # via -r requirements/base.in
+python-decouple==3.8
+    # 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
-    #   -r requirements/base.in
     #   celery
     #   djangorestframework
     #   drf-yasg
@@ -265,22 +272,22 @@ qrcode==6.1
     # via django-two-factor-auth
 redis==3.5.3
     # via django-redis
-requests==2.25.1
+requests==2.31.0
     # via
     #   commonground-api-common
     #   coreapi
-    #   django-rosetta
     #   gemma-zds-client
     #   mozilla-django-oidc
+    #   open-api-framework
     #   requests-mock
     #   zgw-consumers
 requests-mock==1.8.0
     # via zgw-consumers
-sentry-sdk==1.0.0
-    # via -r requirements/base.in
+sentry-sdk==1.39.2
+    # via open-api-framework
 six==1.16.0
     # via
-    #   django-markup
+    #   bleach
     #   isodate
     #   python-dateutil
     #   qrcode
@@ -298,13 +305,13 @@ uritemplate==3.0.1
     #   coreapi
     #   drf-spectacular
     #   drf-yasg
-urllib3==1.26.6
+urllib3==2.2.1
     # via
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.21
-    # via -r requirements/base.in
+uwsgi==2.0.23
+    # via open-api-framework
 vine==5.1.0
     # via
     #   amqp
@@ -314,10 +321,14 @@ wcwidth==0.2.13
     # via prompt-toolkit
 webauthn==2.0.0
     # via django-two-factor-auth
+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