Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Maintenance: upgrade dependencies of webserver service #3038

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions requirements/tools/check_changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def classify_reqs_path(reqs_path: str) -> ReqsClassification:

def get_symbol(c: ReqsClassification):
symbol = "🧪"
if c.module_type == "service" and c.reqs_type not in ("test", "tools"):
if c.module_type == "services" and c.reqs_type not in ("test", "tools"):
symbol = "⬆️"
elif c.reqs_type == "tools":
symbol = "🔧"
Expand Down Expand Up @@ -132,10 +132,11 @@ def main_changes_stats() -> None:
before, after, counts, lib2reqs = parse_changes(filepath)

# format
print("## Changes to libraries (only updated libraries are included)")
print("### Highlights on updated libraries (only updated libraries are included)")
print()
print("- #packages before:", len(before))
print("- #packages after :", len(after))
print()
print("")

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

Expand Down Expand Up @@ -173,6 +174,13 @@ def main_changes_stats() -> None:
"|",
)

print()
print("*Legend*: ")
print("- ⬆️ base dependency (only services because packages are floating)")
print("- 🧪 test dependency")
print("- 🔧 tool dependency")
print()


## Stats on installed packages (i.e. defined in txt files)
DEPENDENCY = re.compile(r"([\w_-]+)==([0-9\.-]+)")
Expand Down
4 changes: 1 addition & 3 deletions services/web/server/requirements/_base.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
# socket_id saved in redis does not correspond to client's sio
python-socketio~=4.6.1

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


aio-pika # RabbitMQ client
Expand All @@ -47,11 +45,11 @@ json2html
jsondiff
openpyxl # excel
orjson # json
packaging
parfive # excel
passlib
pint # units
pydantic[email] # models
python-magic # excel
redis
semantic_version
tenacity
43 changes: 21 additions & 22 deletions services/web/server/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in
#
aio-pika==7.1.2
aio-pika==7.2.0
# via -r requirements/_base.in
aiodebug==2.3.0
# via
Expand Down Expand Up @@ -75,9 +75,9 @@ change-case==0.5.2
# via -r requirements/_base.in
charset-normalizer==2.0.12
# via aiohttp
click==8.0.4
click==8.1.3
# via typer
cryptography==36.0.2
cryptography==37.0.2
# via
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
Expand All @@ -91,7 +91,7 @@ deprecated==1.2.13
# via redis
dnspython==2.2.1
# via email-validator
email-validator==1.1.3
email-validator==1.2.1
# via pydantic
et-xmlfile==1.1.0
# via openpyxl
Expand All @@ -113,7 +113,7 @@ isodate==0.6.1
# via openapi-core
jinja-app-loader==1.0.2
# via -r requirements/_base.in
jinja2==3.1.1
jinja2==3.1.2
# via
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
Expand All @@ -125,12 +125,13 @@ jinja2==3.1.1
# aiohttp-swagger
json2html==1.3.0
# via -r requirements/_base.in
jsondiff==1.3.1
jsondiff==2.0.0
# via -r requirements/_base.in
jsonschema==3.2.0
# via
# -c requirements/../../../../packages/service-library/requirements/././constraints.txt
# -c requirements/../../../../packages/service-library/requirements/./constraints.txt
# -r requirements/../../../../packages/models-library/requirements/_base.in
# -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
# openapi-schema-validator
# openapi-spec-validator
Expand All @@ -156,21 +157,21 @@ openapi-spec-validator==0.4.0
# via openapi-core
openpyxl==3.0.9
# via -r requirements/_base.in
orjson==3.6.7
orjson==3.6.8
# via -r requirements/_base.in
packaging==21.3
# via
# pint
# -r requirements/_base.in
# redis
pamqp==3.1.0
# via aiormq
parfive==1.5.1
# via -r requirements/_base.in
passlib==1.7.4
# via -r requirements/_base.in
pint==0.18
pint==0.19.2
# via -r requirements/_base.in
prometheus-client==0.13.1
prometheus-client==0.14.1
# via -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
psycopg2-binary==2.9.3
# via
Expand Down Expand Up @@ -198,7 +199,7 @@ pyinstrument==3.4.2
# -r requirements/../../../../packages/service-library/requirements/_base.in
pyinstrument-cext==0.2.4
# via pyinstrument
pyparsing==3.0.7
pyparsing==3.0.9
# via packaging
pyrsistent==0.18.1
# via jsonschema
Expand All @@ -222,11 +223,9 @@ pyyaml==5.4.1
# -r requirements/../../../../packages/service-library/requirements/_base.in
# aiohttp-swagger
# openapi-spec-validator
redis==4.2.2
# via -r requirements/_base.in
semantic-version==2.9.0
redis==4.3.1
# via -r requirements/_base.in
setproctitle==1.2.2
setproctitle==1.2.3
# via gunicorn
six==1.16.0
# via
Expand All @@ -235,7 +234,7 @@ six==1.16.0
# openapi-core
# python-engineio
# python-socketio
sqlalchemy==1.4.32
sqlalchemy==1.4.36
# via
# -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
Expand All @@ -253,24 +252,24 @@ tenacity==8.0.1
# -c requirements/../../../../packages/service-library/requirements/./_base.in
# -r requirements/../../../../packages/service-library/requirements/_base.in
# -r requirements/_base.in
tqdm==4.63.1
tqdm==4.64.0
# via parfive
typer==0.4.1
# via -r requirements/../../../../packages/settings-library/requirements/_base.in
typing-extensions==4.1.1
typing-extensions==4.2.0
# via
# aiodebug
# pydantic
ujson==5.1.0
ujson==5.2.0
# via aiohttp-swagger
werkzeug==2.0.3
werkzeug==2.1.2
# via -r requirements/../../../../packages/service-library/requirements/_aiohttp.in
wrapt==1.14.0
wrapt==1.14.1
# via deprecated
yarl==1.5.1
# via
# -c requirements/./constraints.txt
# -r requirements/../../../../packages/postgres-database/requirements/_base.in
# -r requirements/_base.in
# aio-pika
# aiohttp
# aiormq
Expand Down
18 changes: 9 additions & 9 deletions services/web/server/requirements/_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ charset-normalizer==2.0.12
# -c requirements/_base.txt
# aiohttp
# requests
click==8.0.4
click==8.1.3
# via
# -c requirements/_base.txt
# -r requirements/_test.in
Expand All @@ -64,7 +64,7 @@ coverage==6.3.2
# pytest-cov
coveralls==3.3.1
# via -r requirements/_test.in
cryptography==36.0.2
cryptography==37.0.2
# via
# -c requirements/../../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand All @@ -91,7 +91,7 @@ docopt==0.6.2
# via
# coveralls
# docker-compose
faker==13.7.0
faker==13.11.0
# via -r requirements/_test.in
flaky==3.7.0
# via -r requirements/_test.in
Expand All @@ -104,7 +104,7 @@ greenlet==1.1.2
# via
# -c requirements/_base.txt
# sqlalchemy
hypothesis==6.46.2
hypothesis==6.46.3
# via -r requirements/_test.in
icdiff==2.0.5
# via pytest-icdiff
Expand Down Expand Up @@ -183,7 +183,7 @@ pylint==2.13.8
# via -r requirements/_test.in
pynacl==1.5.0
# via paramiko
pyparsing==3.0.7
pyparsing==3.0.9
# via
# -c requirements/_base.txt
# packaging
Expand Down Expand Up @@ -232,7 +232,7 @@ pyyaml==5.4.1
# -c requirements/_base.txt
# docker-compose
# openapi-spec-validator
redis==4.2.2
redis==4.3.1
# via
# -c requirements/_base.txt
# -r requirements/_test.in
Expand All @@ -252,7 +252,7 @@ six==1.16.0
# websocket-client
sortedcontainers==2.4.0
# via hypothesis
sqlalchemy==1.4.32
sqlalchemy==1.4.36
# via
# -c requirements/../../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand All @@ -270,7 +270,7 @@ tomli==2.0.1
# coverage
# pylint
# pytest
typing-extensions==4.1.1
typing-extensions==4.2.0
# via
# -c requirements/_base.txt
# astroid
Expand All @@ -285,7 +285,7 @@ websocket-client==0.59.0
# docker-compose
websockets==10.3
# via -r requirements/_test.in
wrapt==1.14.0
wrapt==1.14.1
# via
# -c requirements/_base.txt
# astroid
Expand Down
4 changes: 2 additions & 2 deletions services/web/server/requirements/_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bump2version==1.0.1
# via -r requirements/../../../../requirements/devenv.txt
cfgv==3.3.1
# via pre-commit
click==8.0.4
click==8.1.3
# via
# -c requirements/_base.txt
# -c requirements/_test.txt
Expand Down Expand Up @@ -65,7 +65,7 @@ tomli==2.0.1
# -c requirements/_test.txt
# black
# pep517
typing-extensions==4.1.1
typing-extensions==4.2.0
# via
# -c requirements/_base.txt
# -c requirements/_test.txt
Expand Down
4 changes: 4 additions & 0 deletions services/web/server/requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@
#
# SEE https://github.com/joerick/pyinstrument#v400release
pyinstrument<4


# SEE services/web/server/tests/unit/isolated/test_utils.py::test_yarl_url_compose_changed_with_latest_release
yarl<1.6
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

"""
import pkg_resources
from semantic_version import Version
from packaging.version import Version

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

Expand Down