Skip to content

Commit 849c374

Browse files
committed
➕ Replace shared deps with open-api-framework
1 parent 12cf4e4 commit 849c374

File tree

4 files changed

+253
-132
lines changed

4 files changed

+253
-132
lines changed

requirements/base.in

+2-27
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,8 @@
1+
open-api-framework
2+
13
# Core python libraries
2-
celery
34
glom # data represenation based on spec
4-
psycopg2 # database driver
5-
python-dotenv # environment variables for secrets
6-
python-decouple # processing of envvar configs
75
jsonschema
86

9-
# Framework libraries
10-
django~=4.2
11-
django-admin-index
12-
django-axes
13-
django-redis
14-
maykin-2fa
15-
mozilla-django-oidc-db
16-
17-
# API libraries
18-
djangorestframework
19-
djangorestframework-gis
20-
# django-extra-fields
21-
django-filter
22-
drf-spectacular # api documentation
23-
24-
# WSGI servers & monitoring - production oriented
25-
uwsgi
26-
sentry-sdk # error monitoring
27-
elastic-apm # Elastic APM integration
28-
flower # task monitoring
29-
307
# Common ground libraries
318
notifications-api-common
32-
commonground-api-common[markdown_docs]
33-
zgw-consumers # external api auths

requirements/base.txt

+59-39
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
amqp==5.2.0
88
# via kombu
99
asgiref==3.7.2
10-
# via django
10+
# via
11+
# django
12+
# django-cors-headers
1113
asn1crypto==1.5.1
1214
# via webauthn
1315
attrs==20.3.0
@@ -16,17 +18,19 @@ attrs==20.3.0
1618
# jsonschema
1719
billiard==3.6.4.0
1820
# via celery
21+
bleach==6.1.0
22+
# via open-api-framework
1923
boltons==21.0.0
2024
# via
2125
# face
2226
# glom
2327
cbor2==5.6.1
2428
# via webauthn
25-
celery==5.2.2
29+
celery==5.2.7
2630
# via
27-
# -r requirements/base.in
2831
# flower
2932
# notifications-api-common
33+
# open-api-framework
3034
certifi==2020.12.5
3135
# via
3236
# django-simple-certmanager
@@ -35,7 +39,7 @@ certifi==2020.12.5
3539
# sentry-sdk
3640
cffi==1.16.0
3741
# via cryptography
38-
chardet==4.0.0
42+
charset-normalizer==3.3.2
3943
# via requests
4044
click==8.1.7
4145
# via
@@ -49,8 +53,8 @@ click-plugins==1.1.1
4953
# via celery
5054
click-repl==0.3.0
5155
# via celery
52-
commonground-api-common[markdown-docs,markdown_docs]==1.13.0
53-
# via -r requirements/base.in
56+
commonground-api-common==1.13.0
57+
# via open-api-framework
5458
coreapi==2.3.3
5559
# via commonground-api-common
5660
coreschema==0.0.4
@@ -64,10 +68,10 @@ cryptography==41.0.7
6468
# webauthn
6569
django==4.2.11
6670
# via
67-
# -r requirements/base.in
6871
# commonground-api-common
6972
# django-admin-index
7073
# django-axes
74+
# django-cors-headers
7175
# django-filter
7276
# django-formtools
7377
# django-jsonform
@@ -83,28 +87,34 @@ django==4.2.11
8387
# django-solo
8488
# django-two-factor-auth
8589
# djangorestframework
90+
# djangorestframework-inclusions
8691
# drf-nested-routers
8792
# drf-spectacular
8893
# drf-yasg
8994
# maykin-2fa
9095
# mozilla-django-oidc
9196
# mozilla-django-oidc-db
9297
# notifications-api-common
98+
# open-api-framework
9399
# zgw-consumers
94100
django-admin-index==3.1.0
95-
# via -r requirements/base.in
101+
# via open-api-framework
96102
django-axes==6.3.0
97-
# via -r requirements/base.in
103+
# via open-api-framework
104+
django-cors-headers==4.3.1
105+
# via open-api-framework
98106
django-filter==23.5
99107
# via
100-
# -r requirements/base.in
101108
# commonground-api-common
109+
# open-api-framework
102110
django-formtools==2.3
103111
# via django-two-factor-auth
104112
django-jsonform==2.21.4
105-
# via mozilla-django-oidc-db
106-
django-markup==1.3
107-
# via commonground-api-common
113+
# via
114+
# mozilla-django-oidc-db
115+
# open-api-framework
116+
django-markup==1.8.1
117+
# via open-api-framework
108118
django-ordered-model==3.7.4
109119
# via django-admin-index
110120
django-otp==1.0.6
@@ -114,7 +124,7 @@ django-phonenumber-field==5.2.0
114124
django-privates==2.0.0.post0
115125
# via django-simple-certmanager
116126
django-redis==5.4.0
117-
# via -r requirements/base.in
127+
# via open-api-framework
118128
django-relativedelta==2.0.0
119129
# via zgw-consumers
120130
django-rest-framework-condition==0.1.1
@@ -133,33 +143,38 @@ django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
133143
# via maykin-2fa
134144
djangorestframework==3.14.0
135145
# via
136-
# -r requirements/base.in
137146
# commonground-api-common
138147
# djangorestframework-gis
148+
# djangorestframework-inclusions
139149
# drf-nested-routers
140150
# drf-spectacular
141151
# drf-yasg
142152
# notifications-api-common
153+
# open-api-framework
143154
djangorestframework-camel-case==1.4.2
144155
# via
145156
# commonground-api-common
146157
# notifications-api-common
147158
djangorestframework-gis==1.0
148-
# via -r requirements/base.in
159+
# via open-api-framework
160+
djangorestframework-inclusions==1.2.0
161+
# via open-api-framework
149162
drf-nested-routers==0.93.3
150163
# via commonground-api-common
151-
drf-spectacular==0.26.5
152-
# via -r requirements/base.in
164+
drf-spectacular==0.27.0
165+
# via open-api-framework
153166
drf-yasg==1.21.7
154167
# via commonground-api-common
155-
elastic-apm==6.1.1
156-
# via -r requirements/base.in
168+
ecs-logging==2.1.0
169+
# via elastic-apm
170+
elastic-apm==6.20.0
171+
# via open-api-framework
157172
face==20.1.1
158173
# via glom
159174
faker==8.1.0
160175
# via zgw-consumers
161176
flower==2.0.1
162-
# via -r requirements/base.in
177+
# via open-api-framework
163178
gemma-zds-client==1.0.1
164179
# via
165180
# commonground-api-common
@@ -193,20 +208,20 @@ jsonschema==4.17.3
193208
# drf-spectacular
194209
kombu==5.3.5
195210
# via celery
196-
markdown==3.5.2
197-
# via commonground-api-common
198211
markupsafe==2.1.3
199212
# via jinja2
200213
maykin-2fa==1.0.0
201-
# via -r requirements/base.in
214+
# via open-api-framework
202215
mozilla-django-oidc==4.0.0
203216
# via mozilla-django-oidc-db
204217
mozilla-django-oidc-db==0.14.1
205-
# via -r requirements/base.in
218+
# via open-api-framework
206219
notifications-api-common==0.2.2
207220
# via
208221
# -r requirements/base.in
209222
# commonground-api-common
223+
open-api-framework==0.2.0
224+
# via -r requirements/base.in
210225
oyaml==1.0
211226
# via commonground-api-common
212227
packaging==23.2
@@ -217,8 +232,8 @@ prometheus-client==0.20.0
217232
# via flower
218233
prompt-toolkit==3.0.43
219234
# via click-repl
220-
psycopg2==2.8.6
221-
# via -r requirements/base.in
235+
psycopg2==2.9.9
236+
# via open-api-framework
222237
pycparser==2.20
223238
# via cffi
224239
pyjwt==2.4.0
@@ -237,11 +252,11 @@ python-dateutil==2.8.1
237252
# via
238253
# django-relativedelta
239254
# faker
240-
python-decouple==3.4
241-
# via -r requirements/base.in
255+
python-decouple==3.8
256+
# via open-api-framework
242257
python-dotenv==1.0.0
243-
# via -r requirements/base.in
244-
pytz==2021.1
258+
# via open-api-framework
259+
pytz==2024.1
245260
# via
246261
# celery
247262
# djangorestframework
@@ -257,21 +272,22 @@ qrcode==6.1
257272
# via django-two-factor-auth
258273
redis==3.5.3
259274
# via django-redis
260-
requests==2.25.1
275+
requests==2.31.0
261276
# via
262277
# commonground-api-common
263278
# coreapi
264279
# gemma-zds-client
265280
# mozilla-django-oidc
281+
# open-api-framework
266282
# requests-mock
267283
# zgw-consumers
268284
requests-mock==1.8.0
269285
# via zgw-consumers
270-
sentry-sdk==1.0.0
271-
# via -r requirements/base.in
286+
sentry-sdk==1.39.2
287+
# via open-api-framework
272288
six==1.16.0
273289
# via
274-
# django-markup
290+
# bleach
275291
# isodate
276292
# python-dateutil
277293
# qrcode
@@ -289,13 +305,13 @@ uritemplate==3.0.1
289305
# coreapi
290306
# drf-spectacular
291307
# drf-yasg
292-
urllib3==1.26.6
308+
urllib3==2.2.1
293309
# via
294310
# elastic-apm
295311
# requests
296312
# sentry-sdk
297-
uwsgi==2.0.21
298-
# via -r requirements/base.in
313+
uwsgi==2.0.23
314+
# via open-api-framework
299315
vine==5.1.0
300316
# via
301317
# amqp
@@ -305,10 +321,14 @@ wcwidth==0.2.13
305321
# via prompt-toolkit
306322
webauthn==2.0.0
307323
# via django-two-factor-auth
324+
webencodings==0.5.1
325+
# via bleach
326+
wrapt==1.14.1
327+
# via elastic-apm
308328
zgw-consumers==0.27.0
309329
# via
310-
# -r requirements/base.in
311330
# notifications-api-common
331+
# open-api-framework
312332

313333
# The following packages are considered to be unsafe in a requirements file:
314334
# setuptools

0 commit comments

Comments
 (0)