Skip to content

Commit 863ac1d

Browse files
pcrespovpcrespov
committed
Fixes webserver reqs
1 parent 5d7e9f2 commit 863ac1d

File tree

15 files changed

+277
-104
lines changed

15 files changed

+277
-104
lines changed

‎packages/service-library/requirements/_aiohttp.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
--constraint ../../../requirements/constraints.txt
7-
--constraint ./_base.txt
7+
--constraint ./_base.in
88

99
openapi-core==0.12.0 # frozen until https://github.com/ITISFoundation/osparc-simcore/pull/1396 is CLOSED
1010
lazy-object-proxy~=1.4.3 # cannot upgrade due to contraints in openapi-core

‎packages/service-library/requirements/_aiohttp.txt

+11-14
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,34 @@
77
aiohttp==3.7.4.post0
88
# via
99
# -c requirements/../../../requirements/constraints.txt
10-
# -c requirements/./_base.txt
10+
# -c requirements/./../../../requirements/constraints.txt
1111
# -r requirements/_aiohttp.in
1212
# aiozipkin
1313
aiopg==1.3.1
1414
# via -r requirements/_aiohttp.in
1515
aiozipkin==0.7.1
1616
# via
1717
# -c requirements/../../../requirements/constraints.txt
18+
# -c requirements/./../../../requirements/constraints.txt
1819
# -r requirements/_aiohttp.in
1920
async-timeout==3.0.1
2021
# via
21-
# -c requirements/./_base.txt
2222
# aiohttp
2323
# aiopg
2424
attrs==20.3.0
2525
# via
26-
# -c requirements/./_base.txt
26+
# -c requirements/././constraints.txt
2727
# -r requirements/_aiohttp.in
2828
# aiohttp
2929
# jsonschema
3030
# openapi-core
3131
chardet==4.0.0
32-
# via
33-
# -c requirements/./_base.txt
34-
# aiohttp
32+
# via aiohttp
3533
greenlet==1.1.1
3634
# via sqlalchemy
3735
idna==2.10
3836
# via
39-
# -c requirements/./_base.txt
37+
# -c requirements/././constraints.txt
4038
# yarl
4139
isodate==0.6.0
4240
# via
@@ -53,7 +51,6 @@ lazy-object-proxy==1.4.3
5351
# openapi-core
5452
multidict==5.1.0
5553
# via
56-
# -c requirements/./_base.txt
5754
# aiohttp
5855
# yarl
5956
openapi-core==0.12.0
@@ -73,7 +70,8 @@ pyrsistent==0.18.0
7370
pyyaml==5.4.1
7471
# via
7572
# -c requirements/../../../requirements/constraints.txt
76-
# -c requirements/./_base.txt
73+
# -c requirements/./../../../requirements/constraints.txt
74+
# -c requirements/./_base.in
7775
# openapi-spec-validator
7876
six==1.16.0
7977
# via
@@ -85,20 +83,19 @@ six==1.16.0
8583
sqlalchemy==1.4.22
8684
# via
8785
# -c requirements/../../../requirements/constraints.txt
86+
# -c requirements/./../../../requirements/constraints.txt
8887
# aiopg
8988
strict-rfc3339==0.7
9089
# via openapi-core
9190
trafaret==2.1.0
9291
# via -r requirements/_aiohttp.in
9392
typing-extensions==3.10.0.0
94-
# via
95-
# -c requirements/./_base.txt
96-
# aiohttp
93+
# via aiohttp
9794
werkzeug==2.0.1
9895
# via -r requirements/_aiohttp.in
99-
yarl==1.6.3
96+
yarl==1.5.1
10097
# via
101-
# -c requirements/./_base.txt
98+
# -c requirements/././constraints.txt
10299
# aiohttp
103100

104101
# The following packages are considered to be unsafe in a requirements file:

‎packages/service-library/requirements/constraints.txt

+4
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ idna<3,>=2.5
88
# attrs>=19.2.0 (from pytest==6.2.4->-r requirements/_test.in (line 13))
99
# attrs<21,>=19 (from pytest-docker==0.10.1
1010
attrs<21,>=19.2.0
11+
12+
13+
# SEE services/web/server/tests/unit/isolated/test_utils.py::test_yarl_url_compose_changed_with_latest_release
14+
yarl<1.6

‎services/web/server/requirements/Makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
include ../../../../requirements/base.Makefile
88

9-
packages_input_reqs = $(shell grep "requirements/_base.in" _base.in | awk '{print $$2}')
9+
# TODO: Check these dependencies packages_input_reqs = $(shell grep "requirements/_base.in" _base.in | awk '{print $$2}')
10+
# _base.txt: _base.in $(packages_input_reqs)
1011

11-
_base.txt: _base.in $(packages_input_reqs)
12+
_base.txt: _base.in _packages.in
13+
_packages.txt: _packages.in _base.in
14+
_test.txt: _base.txt _packages.txt

‎services/web/server/requirements/_base.in

+11-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@
22
# Specifies third-party dependencies for 'services/web/server/src'
33
#
44
--constraint ../../../../requirements/constraints.txt
5-
# NOTE: These input-requirements under packages are tested using latest updates
6-
--requirement ../../../../packages/models-library/requirements/_base.in
7-
--requirement ../../../../packages/postgres-database/requirements/_base.in
8-
--requirement ../../../../packages/service-library/requirements/_base.in
5+
6+
# intra-repo packages CONSTRAINTS
7+
# - Input-requirements on intra-repo packages are tested using latest updates
8+
# - Added as constraints instead of requirements in order to avoid polluting base.txt
9+
# - Will be installed when prod.txt or dev.txt
10+
#
11+
--constraint ../../../../packages/models-library/requirements/_base.in
12+
--constraint ../../../../packages/postgres-database/requirements/_base.in
13+
--constraint ../../../../packages/service-library/requirements/_base.in
14+
--constraint ../../../../packages/service-library/requirements/_aiohttp.in
15+
916

1017
# aiohttp + extensions
1118
aiohttp
@@ -14,8 +21,6 @@ aiohttp_session[secure]
1421
aiohttp_security
1522
aiohttp-swagger[performance]
1623

17-
# SEE services/web/server/tests/unit/isolated/test_utils.py::test_yarl_url_compose_changed_with_latest_release
18-
yarl<1.6
1924

2025
# web-sockets
2126
# From 5.0.0, https://github.com/miguelgrinberg/python-socketio/blob/main/CHANGES.md

‎services/web/server/requirements/_base.txt

+29-68
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@ aio-pika==6.8.0
88
# via -r requirements/_base.in
99
aiodebug==1.1.2
1010
# via
11-
# -r requirements/../../../../packages/service-library/requirements/_base.in
11+
# -c requirements/../../../../packages/service-library/requirements/./_base.in
12+
# -c requirements/../../../../packages/service-library/requirements/_base.in
1213
# -r requirements/_base.in
1314
aiohttp==3.7.4.post0
1415
# via
1516
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
1617
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
1718
# -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
19+
# -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
20+
# -c requirements/../../../../packages/service-library/requirements/_aiohttp.in
1821
# -c requirements/../../../../requirements/constraints.txt
19-
# -r requirements/../../../../packages/service-library/requirements/_base.in
2022
# -r requirements/_base.in
2123
# aiohttp-jinja2
2224
# aiohttp-security
2325
# aiohttp-session
2426
# aiohttp-swagger
25-
# aiozipkin
2627
# parfive
2728
aiohttp-jinja2==1.4.2
2829
# via -r requirements/_base.in
@@ -34,13 +35,14 @@ aiohttp-swagger==1.0.15
3435
# via -r requirements/_base.in
3536
aiopg==1.2.1
3637
# via
37-
# -r requirements/../../../../packages/service-library/requirements/_base.in
38+
# -c requirements/../../../../packages/service-library/requirements/_aiohttp.in
3839
# -r requirements/_base.in
3940
aioredis==1.3.1
4041
# via
4142
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
4243
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
4344
# -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
45+
# -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
4446
# -c requirements/../../../../requirements/constraints.txt
4547
# -r requirements/_base.in
4648
# aioredlock
@@ -50,13 +52,6 @@ aiormq==3.3.1
5052
# via aio-pika
5153
aiosmtplib==1.1.6
5254
# via -r requirements/_base.in
53-
aiozipkin==0.7.1
54-
# via
55-
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
56-
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
57-
# -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
58-
# -c requirements/../../../../requirements/constraints.txt
59-
# -r requirements/../../../../packages/service-library/requirements/_base.in
6055
amqp==5.0.6
6156
# via kombu
6257
async-timeout==3.0.1
@@ -68,11 +63,11 @@ asyncpg==0.23.0
6863
# via -r requirements/_base.in
6964
attrs==20.3.0
7065
# via
71-
# -r requirements/../../../../packages/service-library/requirements/_base.in
66+
# -c requirements/../../../../packages/service-library/requirements/././constraints.txt
67+
# -c requirements/../../../../packages/service-library/requirements/./constraints.txt
68+
# -c requirements/../../../../packages/service-library/requirements/_aiohttp.in
7269
# aiohttp
7370
# aioredlock
74-
# jsonschema
75-
# openapi-core
7671
billiard==3.6.4.0
7772
# via celery
7873
celery==5.1.1
@@ -100,6 +95,7 @@ cryptography==3.4.7
10095
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
10196
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
10297
# -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
98+
# -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
10399
# -c requirements/../../../../requirements/constraints.txt
104100
# -r requirements/_base.in
105101
# aiohttp-session
@@ -115,40 +111,29 @@ hiredis==2.0.0
115111
# via aioredis
116112
idna==2.10
117113
# via
118-
# -r requirements/../../../../packages/models-library/requirements/_base.in
119-
# -r requirements/../../../../packages/postgres-database/requirements/_base.in
120-
# -r requirements/../../../../packages/service-library/requirements/_base.in
114+
# -c requirements/../../../../packages/models-library/requirements/_base.in
115+
# -c requirements/../../../../packages/postgres-database/requirements/_base.in
116+
# -c requirements/../../../../packages/service-library/requirements/././constraints.txt
117+
# -c requirements/../../../../packages/service-library/requirements/./constraints.txt
121118
# email-validator
122119
# yarl
123-
isodate==0.6.0
124-
# via
125-
# openapi-core
126-
# openapi-schema-validator
127120
jinja-app-loader==1.0.2
128121
# via -r requirements/_base.in
129122
jinja2==2.11.3
130123
# via
131124
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
132125
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
133126
# -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
127+
# -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
134128
# -c requirements/../../../../requirements/constraints.txt
135129
# aiohttp-jinja2
136130
# aiohttp-swagger
137131
json2html==1.3.0
138132
# via -r requirements/_base.in
139133
jsondiff==1.3.0
140134
# via -r requirements/_base.in
141-
jsonschema==3.2.0
142-
# via
143-
# -r requirements/../../../../packages/service-library/requirements/_base.in
144-
# openapi-schema-validator
145-
# openapi-spec-validator
146135
kombu==5.1.0
147136
# via celery
148-
lazy-object-proxy==1.4.3
149-
# via
150-
# -r requirements/../../../../packages/service-library/requirements/_base.in
151-
# openapi-core
152137
markupsafe==1.1.1
153138
# via
154139
# aiohttp-swagger
@@ -157,12 +142,6 @@ multidict==5.1.0
157142
# via
158143
# aiohttp
159144
# yarl
160-
openapi-core==0.12.0
161-
# via -r requirements/../../../../packages/service-library/requirements/_base.in
162-
openapi-schema-validator==0.1.5
163-
# via openapi-spec-validator
164-
openapi-spec-validator==0.3.1
165-
# via openapi-core
166145
openpyxl==3.0.7
167146
# via -r requirements/_base.in
168147
orjson==3.5.3
@@ -173,32 +152,25 @@ parfive==1.0.2
173152
# via -r requirements/_base.in
174153
passlib==1.7.4
175154
# via -r requirements/_base.in
176-
prometheus-client==0.11.0
177-
# via -r requirements/../../../../packages/service-library/requirements/_base.in
178155
prompt-toolkit==3.0.19
179156
# via click-repl
180157
psycopg2-binary==2.9.1
181158
# via
182-
# -r requirements/../../../../packages/service-library/requirements/_base.in
183159
# aiopg
184160
# sqlalchemy
185161
pycparser==2.20
186162
# via cffi
187163
pydantic==1.8.2
188164
# via
189165
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
166+
# -c requirements/../../../../packages/models-library/requirements/_base.in
190167
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
191168
# -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
169+
# -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
170+
# -c requirements/../../../../packages/service-library/requirements/./_base.in
171+
# -c requirements/../../../../packages/service-library/requirements/_base.in
192172
# -c requirements/../../../../requirements/constraints.txt
193-
# -r requirements/../../../../packages/models-library/requirements/_base.in
194-
# -r requirements/../../../../packages/service-library/requirements/_base.in
195173
# -r requirements/_base.in
196-
pyinstrument==3.4.2
197-
# via -r requirements/../../../../packages/service-library/requirements/_base.in
198-
pyinstrument-cext==0.2.4
199-
# via pyinstrument
200-
pyrsistent==0.17.3
201-
# via jsonschema
202174
python-engineio==3.14.2
203175
# via python-socketio
204176
python-magic==0.4.24
@@ -212,50 +184,40 @@ pyyaml==5.4.1
212184
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
213185
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
214186
# -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
187+
# -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
188+
# -c requirements/../../../../packages/service-library/requirements/./_base.in
189+
# -c requirements/../../../../packages/service-library/requirements/_base.in
215190
# -c requirements/../../../../requirements/constraints.txt
216-
# -r requirements/../../../../packages/service-library/requirements/_base.in
217191
# aiohttp-swagger
218-
# openapi-spec-validator
219192
redis==3.5.3
220193
# via celery
221194
semantic-version==2.8.5
222195
# via -r requirements/_base.in
223196
six==1.16.0
224197
# via
225198
# click-repl
226-
# isodate
227-
# jsonschema
228-
# openapi-core
229-
# openapi-schema-validator
230-
# openapi-spec-validator
231199
# python-engineio
232200
# python-socketio
233-
# tenacity
234201
sqlalchemy==1.3.24
235202
# via
236203
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
237204
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
205+
# -c requirements/../../../../packages/postgres-database/requirements/_base.in
238206
# -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt
207+
# -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt
239208
# -c requirements/../../../../requirements/constraints.txt
240-
# -r requirements/../../../../packages/postgres-database/requirements/_base.in
241-
# -r requirements/../../../../packages/service-library/requirements/_base.in
242209
# aiopg
243-
strict-rfc3339==0.7
244-
# via openapi-core
245-
tenacity==7.0.0
246-
# via -r requirements/../../../../packages/service-library/requirements/_base.in
247210
tqdm==4.61.1
248211
# via parfive
249-
trafaret==2.1.0
250-
# via -r requirements/../../../../packages/service-library/requirements/_base.in
251212
typing-extensions==3.10.0.0
252213
# via
253214
# aiohttp
254215
# aiohttp-jinja2
255216
# pydantic
256217
ujson==4.0.2
257218
# via
258-
# -r requirements/../../../../packages/service-library/requirements/_base.in
219+
# -c requirements/../../../../packages/service-library/requirements/./_base.in
220+
# -c requirements/../../../../packages/service-library/requirements/_base.in
259221
# aiohttp-swagger
260222
vine==5.0.0
261223
# via
@@ -264,12 +226,11 @@ vine==5.0.0
264226
# kombu
265227
wcwidth==0.2.5
266228
# via prompt-toolkit
267-
werkzeug==2.0.1
268-
# via -r requirements/../../../../packages/service-library/requirements/_base.in
269229
yarl==1.5.1
270230
# via
271-
# -r requirements/../../../../packages/postgres-database/requirements/_base.in
272-
# -r requirements/_base.in
231+
# -c requirements/../../../../packages/postgres-database/requirements/_base.in
232+
# -c requirements/../../../../packages/service-library/requirements/././constraints.txt
233+
# -c requirements/../../../../packages/service-library/requirements/./constraints.txt
273234
# aio-pika
274235
# aiohttp
275236
# aiormq

0 commit comments

Comments
 (0)