➕ Replace dependencies with open-api-framework deps

maykinmedia · Jan 26, 2024 · eebef61 · eebef61
1 parent 8f4a69a
commit eebef61
Show file tree

Hide file tree

Showing 5 changed files with 232 additions and 107 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,37 +1,2 @@
-# Core python libraries
-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
-django-admin-index
-django-axes
-django-choices
-django-hijack
+git+https://github.com/maykinmedia/open-api-framework.git#egg=open_api_framework
 django-jsonsuit
-django-redis
-django-rosetta
-django-sniplates
-maykin-django-two-factor-auth
-maykin-django-two-factor-auth[phonenumbers]
-mozilla-django-oidc-db
-sharing-configs
-
-# API libraries
-djangorestframework
-# django-extra-fields
-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
@@ -44,8 +44,8 @@ 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[markdown-docs,markdown_docs]==1.10.2
+    # via open-api-framework
 coreapi==2.3.3
     # via drf-yasg
 coreschema==0.0.4
@@ -60,7 +60,6 @@ cryptography==40.0.2
     #   pyopenssl
 django==3.2.20
     # via
-    #   -r requirements/base.in
     #   commonground-api-common
     #   django-admin-index
     #   django-axes
@@ -69,13 +68,15 @@ django==3.2.20
     #   django-formtools
     #   django-hijack
     #   django-jsonsuit
+    #   django-markup
     #   django-otp
     #   django-phonenumber-field
     #   django-privates
     #   django-redis
     #   django-relativedelta
     #   django-rest-framework-condition
     #   django-rosetta
+    #   django-sendfile2
     #   django-simple-certmanager
     #   django-sniplates
     #   django-solo
@@ -87,28 +88,31 @@ 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
+    # via open-api-framework
 django-axes==6.0.1
-    # via -r requirements/base.in
+    # via open-api-framework
 django-better-admin-arrayfield==1.4.2
     # via mozilla-django-oidc-db
 django-choices==1.7.2
     # via
-    #   -r requirements/base.in
     #   commonground-api-common
+    #   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-hijack==3.3.0
-    # via -r requirements/base.in
+    # via open-api-framework
 django-jsonsuit==0.5.0
     # via -r requirements/base.in
+django-markup==1.3
+    # via commonground-api-common
 django-ordered-model==3.7.4
     # via django-admin-index
 django-otp==1.2.0
@@ -118,19 +122,19 @@ django-phonenumber-field==5.2.0
 django-privates==2.0.0.post0
     # via django-simple-certmanager
 django-redis==5.2.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.9
-    # via -r requirements/base.in
+    # via open-api-framework
 django-sendfile2==0.7.0
     # via django-privates
 django-simple-certmanager==1.3.0
     # via zgw-consumers
 django-sniplates==0.7.1
-    # via -r requirements/base.in
+    # via open-api-framework
 django-solo==2.0.0
     # via
     #   commonground-api-common
@@ -140,26 +144,29 @@ django-solo==2.0.0
     #   zgw-consumers
 djangorestframework==3.12.4
     # via
-    #   -r requirements/base.in
     #   commonground-api-common
+    #   djangorestframework-gis
     #   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 open-api-framework
 drf-nested-routers==0.93.4
     # via
-    #   -r requirements/base.in
     #   commonground-api-common
+    #   open-api-framework
 drf-spectacular==0.26.2
-    # via -r requirements/base.in
+    # via open-api-framework
 drf-yasg==1.21.5
     # via commonground-api-common
 elastic-apm==6.15.1
-    # via -r requirements/base.in
+    # via open-api-framework
 face==20.1.1
     # via glom
 faker==18.9.0
@@ -170,9 +177,13 @@ gemma-zds-client==2.0.0
     #   notifications-api-common
     #   zgw-consumers
 glom==23.3.0
-    # via mozilla-django-oidc-db
+    # via
+    #   mozilla-django-oidc-db
+    #   open-api-framework
 idna==3.4
     # via requests
+importlib-metadata==7.0.1
+    # via markdown
 inflection==0.5.1
     # via
     #   drf-spectacular
@@ -189,34 +200,38 @@ josepy==1.13.0
     # via mozilla-django-oidc
 jsonschema==4.17.3
     # via
-    #   -r requirements/base.in
     #   drf-spectacular
+    #   open-api-framework
 kombu==5.2.4
     # via celery
+markdown==3.5.2
+    # via commonground-api-common
 markupsafe==2.1.2
     # via jinja2
 maykin-django-two-factor-auth[phonenumbers]==2.0.4
-    # via -r requirements/base.in
+    # via open-api-framework
 mozilla-django-oidc==2.0.0
     # via mozilla-django-oidc-db
 mozilla-django-oidc-db==0.12.0
-    # via -r requirements/base.in
+    # 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.git
+    # via -r requirements/base.in
 oyaml==1.0
     # via commonground-api-common
 packaging==23.1
     # via drf-yasg
 phonenumbers==8.13.11
     # via maykin-django-two-factor-auth
 pillow==9.5.0
-    # via -r requirements/base.in
+    # via open-api-framework
 polib==1.2.0
     # via django-rosetta
 prompt-toolkit==3.0.38
     # via click-repl
 psycopg2==2.9.6
-    # via -r requirements/base.in
+    # via open-api-framework
 pycparser==2.21
     # via cffi
 pyjwt==2.7.0
@@ -235,15 +250,15 @@ 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
-    #   -r requirements/base.in
     #   celery
     #   django
     #   drf-yasg
+    #   open-api-framework
 pyyaml==6.0
     # via
     #   commonground-api-common
@@ -271,13 +286,14 @@ ruamel-yaml==0.17.26
 ruamel-yaml-clib==0.2.7
     # via ruamel-yaml
 sentry-sdk==1.23.1
-    # via -r requirements/base.in
+    # via open-api-framework
 sharing-configs==0.1.2
-    # via -r requirements/base.in
+    # via open-api-framework
 six==1.16.0
     # via
     #   click-repl
     #   django-choices
+    #   django-markup
     #   isodate
     #   python-dateutil
     #   qrcode
@@ -295,7 +311,7 @@ urllib3==1.26.15
     #   requests
     #   sentry-sdk
 uwsgi==2.0.21
-    # via -r requirements/base.in
+    # via open-api-framework
 vine==5.0.0
     # via
     #   amqp
@@ -306,7 +322,11 @@ wcwidth==0.2.6
 wrapt==1.15.0
     # via elastic-apm
 zgw-consumers==0.26.1
-    # via notifications-api-common
+    # via
+    #   notifications-api-common
+    #   open-api-framework
+zipp==3.17.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools