➕ Replace shared dependencies with open-api-framework

maykinmedia · Jan 30, 2024 · 3b56b5c · 3b56b5c
1 parent 6356267
commit 3b56b5c
Show file tree

Hide file tree

Showing 6 changed files with 183 additions and 119 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,6 +5,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         pkg-config \
         build-essential \
         libpq-dev \
+        git \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app

diff --git a/requirements/base.in b/requirements/base.in
@@ -1,30 +1,14 @@
+git+https://github.com/maykinmedia/open-api-framework@bada78b0ad5c7479ab42a1377c046c7d7b176b5a
+
 # Core python libraries
-psycopg2  # database driver
-python-dotenv  # environment variables for secrets
-python-decouple  # processing of envvar configs
 jsonschema
 
 # Framework libraries
-django
-django-admin-index
-django-axes
 django-jsonsuit
-django-redis
 maykin-django-two-factor-auth
 maykin-django-two-factor-auth[phonenumbers]
-mozilla-django-oidc-db
 sharing-configs
 
 # API libraries
-djangorestframework
 django-filter
 drf-nested-routers
-drf-spectacular
-
-# WSGI servers & monitoring - production oriented
-uwsgi
-sentry-sdk  # error monitoring
-elastic-apm  # Elastic APM integration
-
-# Common ground libraries
-commonground-api-common
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -21,7 +21,9 @@ boltons==23.0.0
     #   face
     #   glom
 celery==5.2.7
-    # via notifications-api-common
+    # via
+    #   notifications-api-common
+    #   open-api-framework
 certifi==2023.5.7
     # via
     #   django-simple-certmanager
@@ -44,10 +46,12 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.2.0
     # via celery
-commonground-api-common==1.10.2
-    # via -r requirements/base.in
+commonground-api-common==1.12.1
+    # via open-api-framework
 coreapi==2.3.3
-    # via drf-yasg
+    # via
+    #   commonground-api-common
+    #   drf-yasg
 coreschema==0.0.4
     # via
     #   coreapi
@@ -58,22 +62,22 @@ cryptography==40.0.2
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
-django==3.2.20
+django==3.2.23
     # via
-    #   -r requirements/base.in
     #   commonground-api-common
     #   django-admin-index
     #   django-axes
-    #   django-choices
     #   django-filter
     #   django-formtools
+    #   django-jsonform
     #   django-jsonsuit
     #   django-otp
     #   django-phonenumber-field
     #   django-privates
     #   django-redis
     #   django-relativedelta
     #   django-rest-framework-condition
+    #   django-sendfile2
     #   django-simple-certmanager
     #   django-solo
     #   djangorestframework
@@ -84,22 +88,21 @@ django==3.2.20
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
     #   notifications-api-common
+    #   open-api-framework
     #   sharing-configs
     #   zgw-consumers
-django-admin-index==3.0.0
-    # via -r requirements/base.in
-django-axes==6.0.1
-    # via -r requirements/base.in
-django-better-admin-arrayfield==1.4.2
-    # via mozilla-django-oidc-db
-django-choices==1.7.2
-    # via commonground-api-common
+django-admin-index==3.1.0
+    # via open-api-framework
+django-axes==6.3.0
+    # via open-api-framework
 django-filter==23.2
     # via
     #   -r requirements/base.in
     #   commonground-api-common
 django-formtools==2.4.1
     # via maykin-django-two-factor-auth
+django-jsonform==2.21.5
+    # via mozilla-django-oidc-db
 django-jsonsuit==0.5.0
     # via -r requirements/base.in
 django-ordered-model==3.7.4
@@ -110,8 +113,8 @@ django-phonenumber-field==5.2.0
     # via maykin-django-two-factor-auth
 django-privates==2.0.0.post0
     # via django-simple-certmanager
-django-redis==5.2.0
-    # via -r requirements/base.in
+django-redis==5.4.0
+    # via open-api-framework
 django-relativedelta==2.0.0
     # via zgw-consumers
 django-rest-framework-condition==0.1.1
@@ -129,12 +132,12 @@ django-solo==2.0.0
     #   zgw-consumers
 djangorestframework==3.12.4
     # via
-    #   -r requirements/base.in
     #   commonground-api-common
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-yasg
     #   notifications-api-common
+    #   open-api-framework
 djangorestframework-camel-case==1.4.2
     # via
     #   commonground-api-common
@@ -143,12 +146,14 @@ drf-nested-routers==0.93.4
     # via
     #   -r requirements/base.in
     #   commonground-api-common
-drf-spectacular==0.26.2
-    # via -r requirements/base.in
+drf-spectacular==0.27.1
+    # via open-api-framework
 drf-yasg==1.21.5
     # via commonground-api-common
-elastic-apm==6.15.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==18.9.0
@@ -188,10 +193,12 @@ maykin-django-two-factor-auth[phonenumbers]==2.0.4
     # via -r requirements/base.in
 mozilla-django-oidc==2.0.0
     # via mozilla-django-oidc-db
-mozilla-django-oidc-db==0.12.0
-    # via -r requirements/base.in
+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
+    # via -r requirements/base.in
 oyaml==1.0
     # via commonground-api-common
 packaging==23.1
@@ -200,8 +207,8 @@ phonenumbers==8.13.11
     # via maykin-django-two-factor-auth
 prompt-toolkit==3.0.38
     # via click-repl
-psycopg2==2.9.6
-    # via -r requirements/base.in
+psycopg2==2.9.9
+    # via open-api-framework
 pycparser==2.21
     # via cffi
 pyjwt==2.7.0
@@ -220,9 +227,9 @@ python-dateutil==2.8.2
     #   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
+    # via open-api-framework
 pytz==2023.3
     # via
     #   celery
@@ -244,6 +251,7 @@ requests==2.31.0
     #   coreapi
     #   gemma-zds-client
     #   mozilla-django-oidc
+    #   open-api-framework
     #   requests-mock
     #   sharing-configs
     #   zgw-consumers
@@ -253,20 +261,21 @@ ruamel-yaml==0.17.26
     # via drf-yasg
 ruamel-yaml-clib==0.2.7
     # via ruamel-yaml
-sentry-sdk==1.23.1
-    # via -r requirements/base.in
+sentry-sdk==1.39.2
+    # via open-api-framework
 sharing-configs==0.1.2
     # via -r requirements/base.in
 six==1.16.0
     # via
     #   click-repl
-    #   django-choices
     #   isodate
     #   python-dateutil
     #   qrcode
     #   requests-mock
 sqlparse==0.4.4
     # via django
+typing-extensions==4.9.0
+    # via drf-spectacular
 uritemplate==4.1.1
     # via
     #   coreapi
@@ -277,19 +286,21 @@ urllib3==1.26.15
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.21
-    # via -r requirements/base.in
+uwsgi==2.0.23
+    # via open-api-framework
 vine==5.0.0
     # via
     #   amqp
     #   celery
     #   kombu
 wcwidth==0.2.6
     # via prompt-toolkit
-wrapt==1.15.0
+wrapt==1.14.1
     # via elastic-apm
-zgw-consumers==0.26.1
-    # via notifications-api-common
+zgw-consumers==0.27.0
+    # via
+    #   notifications-api-common
+    #   open-api-framework
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools