Skip to content

Commit e15ccba

Browse files
authored
⬆️ Maintenance: upgrade dependencies of webserver service (ITISFoundation#3038)
1 parent 1ac5803 commit e15ccba

File tree

7 files changed

+49
-40
lines changed

7 files changed

+49
-40
lines changed

requirements/tools/check_changes.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def classify_reqs_path(reqs_path: str) -> ReqsClassification:
104104

105105
def get_symbol(c: ReqsClassification):
106106
symbol = "🧪"
107-
if c.module_type == "service" and c.reqs_type not in ("test", "tools"):
107+
if c.module_type == "services" and c.reqs_type not in ("test", "tools"):
108108
symbol = "⬆️"
109109
elif c.reqs_type == "tools":
110110
symbol = "🔧"
@@ -132,10 +132,11 @@ def main_changes_stats() -> None:
132132
before, after, counts, lib2reqs = parse_changes(filepath)
133133

134134
# format
135-
print("## Changes to libraries (only updated libraries are included)")
135+
print("### Highlights on updated libraries (only updated libraries are included)")
136+
print()
136137
print("- #packages before:", len(before))
137138
print("- #packages after :", len(after))
138-
print()
139+
print("")
139140

140141
COLUMNS = ["#", "name", "before", "after", "upgrade", "count", "packages"]
141142

@@ -173,6 +174,13 @@ def main_changes_stats() -> None:
173174
"|",
174175
)
175176

177+
print()
178+
print("*Legend*: ")
179+
print("- ⬆️ base dependency (only services because packages are floating)")
180+
print("- 🧪 test dependency")
181+
print("- 🔧 tool dependency")
182+
print()
183+
176184

177185
## Stats on installed packages (i.e. defined in txt files)
178186
DEPENDENCY = re.compile(r"([\w_-]+)==([0-9\.-]+)")

services/web/server/requirements/_base.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
# socket_id saved in redis does not correspond to client's sio
2424
python-socketio~=4.6.1
2525

26-
# SEE services/web/server/tests/unit/isolated/test_utils.py::test_yarl_url_compose_changed_with_latest_release
27-
yarl<1.6
2826

2927

3028
aio-pika # RabbitMQ client
@@ -47,11 +45,11 @@ json2html
4745
jsondiff
4846
openpyxl # excel
4947
orjson # json
48+
packaging
5049
parfive # excel
5150
passlib
5251
pint # units
5352
pydantic[email] # models
5453
python-magic # excel
5554
redis
56-
semantic_version
5755
tenacity

services/web/server/requirements/_base.txt

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in
66
#
7-
aio-pika==7.1.2
7+
aio-pika==7.2.0
88
# via -r requirements/_base.in
99
aiodebug==2.3.0
1010
# via
@@ -75,9 +75,9 @@ change-case==0.5.2
7575
# via -r requirements/_base.in
7676
charset-normalizer==2.0.12
7777
# via aiohttp
78-
click==8.0.4
78+
click==8.1.3
7979
# via typer
80-
cryptography==36.0.2
80+
cryptography==37.0.2
8181
# via
8282
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
8383
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
@@ -91,7 +91,7 @@ deprecated==1.2.13
9191
# via redis
9292
dnspython==2.2.1
9393
# via email-validator
94-
email-validator==1.1.3
94+
email-validator==1.2.1
9595
# via pydantic
9696
et-xmlfile==1.1.0
9797
# via openpyxl
@@ -113,7 +113,7 @@ isodate==0.6.1
113113
# via openapi-core
114114
jinja-app-loader==1.0.2
115115
# via -r requirements/_base.in
116-
jinja2==3.1.1
116+
jinja2==3.1.2
117117
# via
118118
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
119119
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
@@ -125,12 +125,13 @@ jinja2==3.1.1
125125
# aiohttp-swagger
126126
json2html==1.3.0
127127
# via -r requirements/_base.in
128-
jsondiff==1.3.1
128+
jsondiff==2.0.0
129129
# via -r requirements/_base.in
130130
jsonschema==3.2.0
131131
# via
132132
# -c requirements/../../../../packages/service-library/requirements/././constraints.txt
133133
# -c requirements/../../../../packages/service-library/requirements/./constraints.txt
134+
# -r requirements/../../../../packages/models-library/requirements/_base.in
134135
# -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
135136
# openapi-schema-validator
136137
# openapi-spec-validator
@@ -156,21 +157,21 @@ openapi-spec-validator==0.4.0
156157
# via openapi-core
157158
openpyxl==3.0.9
158159
# via -r requirements/_base.in
159-
orjson==3.6.7
160+
orjson==3.6.8
160161
# via -r requirements/_base.in
161162
packaging==21.3
162163
# via
163-
# pint
164+
# -r requirements/_base.in
164165
# redis
165166
pamqp==3.1.0
166167
# via aiormq
167168
parfive==1.5.1
168169
# via -r requirements/_base.in
169170
passlib==1.7.4
170171
# via -r requirements/_base.in
171-
pint==0.18
172+
pint==0.19.2
172173
# via -r requirements/_base.in
173-
prometheus-client==0.13.1
174+
prometheus-client==0.14.1
174175
# via -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
175176
psycopg2-binary==2.9.3
176177
# via
@@ -198,7 +199,7 @@ pyinstrument==3.4.2
198199
# -r requirements/../../../../packages/service-library/requirements/_base.in
199200
pyinstrument-cext==0.2.4
200201
# via pyinstrument
201-
pyparsing==3.0.7
202+
pyparsing==3.0.9
202203
# via packaging
203204
pyrsistent==0.18.1
204205
# via jsonschema
@@ -222,11 +223,9 @@ pyyaml==5.4.1
222223
# -r requirements/../../../../packages/service-library/requirements/_base.in
223224
# aiohttp-swagger
224225
# openapi-spec-validator
225-
redis==4.2.2
226-
# via -r requirements/_base.in
227-
semantic-version==2.9.0
226+
redis==4.3.1
228227
# via -r requirements/_base.in
229-
setproctitle==1.2.2
228+
setproctitle==1.2.3
230229
# via gunicorn
231230
six==1.16.0
232231
# via
@@ -235,7 +234,7 @@ six==1.16.0
235234
# openapi-core
236235
# python-engineio
237236
# python-socketio
238-
sqlalchemy==1.4.32
237+
sqlalchemy==1.4.36
239238
# via
240239
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
241240
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
@@ -253,24 +252,24 @@ tenacity==8.0.1
253252
# -c requirements/../../../../packages/service-library/requirements/./_base.in
254253
# -r requirements/../../../../packages/service-library/requirements/_base.in
255254
# -r requirements/_base.in
256-
tqdm==4.63.1
255+
tqdm==4.64.0
257256
# via parfive
258257
typer==0.4.1
259258
# via -r requirements/../../../../packages/settings-library/requirements/_base.in
260-
typing-extensions==4.1.1
259+
typing-extensions==4.2.0
261260
# via
262261
# aiodebug
263262
# pydantic
264-
ujson==5.1.0
263+
ujson==5.2.0
265264
# via aiohttp-swagger
266-
werkzeug==2.0.3
265+
werkzeug==2.1.2
267266
# via -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
268-
wrapt==1.14.0
267+
wrapt==1.14.1
269268
# via deprecated
270269
yarl==1.5.1
271270
# via
271+
# -c requirements/./constraints.txt
272272
# -r requirements/../../../../packages/postgres-database/requirements/_base.in
273-
# -r requirements/_base.in
274273
# aio-pika
275274
# aiohttp
276275
# aiormq

services/web/server/requirements/_test.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ charset-normalizer==2.0.12
5050
# -c requirements/_base.txt
5151
# aiohttp
5252
# requests
53-
click==8.0.4
53+
click==8.1.3
5454
# via
5555
# -c requirements/_base.txt
5656
# -r requirements/_test.in
@@ -64,7 +64,7 @@ coverage==6.3.2
6464
# pytest-cov
6565
coveralls==3.3.1
6666
# via -r requirements/_test.in
67-
cryptography==36.0.2
67+
cryptography==37.0.2
6868
# via
6969
# -c requirements/../../../../requirements/constraints.txt
7070
# -c requirements/_base.txt
@@ -91,7 +91,7 @@ docopt==0.6.2
9191
# via
9292
# coveralls
9393
# docker-compose
94-
faker==13.7.0
94+
faker==13.11.0
9595
# via -r requirements/_test.in
9696
flaky==3.7.0
9797
# via -r requirements/_test.in
@@ -104,7 +104,7 @@ greenlet==1.1.2
104104
# via
105105
# -c requirements/_base.txt
106106
# sqlalchemy
107-
hypothesis==6.46.2
107+
hypothesis==6.46.3
108108
# via -r requirements/_test.in
109109
icdiff==2.0.5
110110
# via pytest-icdiff
@@ -183,7 +183,7 @@ pylint==2.13.8
183183
# via -r requirements/_test.in
184184
pynacl==1.5.0
185185
# via paramiko
186-
pyparsing==3.0.7
186+
pyparsing==3.0.9
187187
# via
188188
# -c requirements/_base.txt
189189
# packaging
@@ -232,7 +232,7 @@ pyyaml==5.4.1
232232
# -c requirements/_base.txt
233233
# docker-compose
234234
# openapi-spec-validator
235-
redis==4.2.2
235+
redis==4.3.1
236236
# via
237237
# -c requirements/_base.txt
238238
# -r requirements/_test.in
@@ -252,7 +252,7 @@ six==1.16.0
252252
# websocket-client
253253
sortedcontainers==2.4.0
254254
# via hypothesis
255-
sqlalchemy==1.4.32
255+
sqlalchemy==1.4.36
256256
# via
257257
# -c requirements/../../../../requirements/constraints.txt
258258
# -c requirements/_base.txt
@@ -270,7 +270,7 @@ tomli==2.0.1
270270
# coverage
271271
# pylint
272272
# pytest
273-
typing-extensions==4.1.1
273+
typing-extensions==4.2.0
274274
# via
275275
# -c requirements/_base.txt
276276
# astroid
@@ -285,7 +285,7 @@ websocket-client==0.59.0
285285
# docker-compose
286286
websockets==10.3
287287
# via -r requirements/_test.in
288-
wrapt==1.14.0
288+
wrapt==1.14.1
289289
# via
290290
# -c requirements/_base.txt
291291
# astroid

services/web/server/requirements/_tools.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bump2version==1.0.1
1010
# via -r requirements/../../../../requirements/devenv.txt
1111
cfgv==3.3.1
1212
# via pre-commit
13-
click==8.0.4
13+
click==8.1.3
1414
# via
1515
# -c requirements/_base.txt
1616
# -c requirements/_test.txt
@@ -65,7 +65,7 @@ tomli==2.0.1
6565
# -c requirements/_test.txt
6666
# black
6767
# pep517
68-
typing-extensions==4.1.1
68+
typing-extensions==4.2.0
6969
# via
7070
# -c requirements/_base.txt
7171
# -c requirements/_test.txt

services/web/server/requirements/constraints.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@
1010
#
1111
# SEE https://github.com/joerick/pyinstrument#v400release
1212
pyinstrument<4
13+
14+
15+
# SEE services/web/server/tests/unit/isolated/test_utils.py::test_yarl_url_compose_changed_with_latest_release
16+
yarl<1.6

services/web/server/src/simcore_service_webserver/_meta.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
"""
44
import pkg_resources
5-
from semantic_version import Version
5+
from packaging.version import Version
66

77
__version__: str = pkg_resources.get_distribution("simcore-service-webserver").version
88

0 commit comments

Comments
 (0)