Skip to content

⬆️ Upgrade api-server requirements and includes pagination library #4411

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jun 23, 2023
Merged

⬆️ Upgrade api-server requirements and includes pagination library #4411

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd2c803
Minor fix: quotes upgrade expression
pcrespov Jun 23, 2023
7834a58
general upgrade of api-server
pcrespov Jun 23, 2023
8c0736d
adds fastapi pagination
pcrespov Jun 23, 2023
cc8fd37
@sanderegg review: modify hotfix
pcrespov Jun 23, 2023
bbe76ce
Merge branch 'master' into is4110/upgrade-api-server
pcrespov Jun 23, 2023
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
2 changes: 1 addition & 1 deletion requirements/base.Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ REPO_BASE_DIR := $(shell git rev-parse --show-toplevel)
.DEFAULT_GOAL := help

DO_CLEAN_OR_UPGRADE:=$(if $(clean),,--upgrade)
UPGRADE_OPTION := $(if $(upgrade),--upgrade-package $(upgrade),$(DO_CLEAN_OR_UPGRADE))
UPGRADE_OPTION := $(if $(upgrade),--upgrade-package "$(upgrade)",$(DO_CLEAN_OR_UPGRADE))


objects = $(sort $(wildcard *.in))
Expand Down
1 change: 1 addition & 0 deletions services/api-server/requirements/_base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
aiofiles
aiopg[sa]
cryptography
fastapi-pagination
fastapi[all]
httpx
orjson
Expand Down
108 changes: 62 additions & 46 deletions services/api-server/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# pip-compile --output-file=requirements/_base.txt --resolver=backtracking --strip-extras requirements/_base.in
#
aio-pika==9.1.2
aio-pika==9.1.3
# via
# -c requirements/../../../packages/service-library/requirements/./_base.in
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
aiocache==0.11.1
aiocache==0.12.1
# via -r requirements/../../../packages/simcore-sdk/requirements/_base.in
aiodebug==2.3.0
# via
Expand All @@ -18,11 +18,11 @@ aiodocker==0.21.0
# via
# -c requirements/../../../packages/service-library/requirements/./_base.in
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
aiofiles==0.8.0
aiofiles==23.1.0
# via
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
# -r requirements/_base.in
aiohttp==3.8.3
aiohttp==3.8.4
# via
# -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
# -r requirements/../../../packages/simcore-sdk/requirements/_base.in
Expand All @@ -33,23 +33,21 @@ aiopg==1.4.0
# -r requirements/_base.in
aiormq==6.7.6
# via aio-pika
aiosignal==1.2.0
aiosignal==1.3.1
# via aiohttp
alembic==1.8.1
alembic==1.11.1
# via
# -r requirements/../../../packages/postgres-database/requirements/_base.in
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
anyio==3.6.2
anyio==3.7.0
# via
# httpcore
# starlette
# watchgod
# watchfiles
arrow==1.2.3
# via
# -c requirements/../../../packages/service-library/requirements/./_base.in
# -r requirements/../../../packages/models-library/requirements/_base.in
asgiref==3.5.2
# via uvicorn
async-timeout==4.0.2
# via
# aiohttp
Expand All @@ -62,50 +60,55 @@ attrs==21.4.0
# -c requirements/../../../packages/service-library/requirements/././constraints.txt
# aiohttp
# jsonschema
certifi==2022.12.7
certifi==2023.5.7
# via
# httpcore
# httpx
cffi==1.15.0
cffi==1.15.1
# via cryptography
charset-normalizer==2.0.12
charset-normalizer==3.1.0
# via aiohttp
click==8.1.3
# via
# typer
# uvicorn
cryptography==39.0.1
cryptography==41.0.1
# via -r requirements/_base.in
dnspython==2.2.1
dnspython==2.3.0
# via email-validator
email-validator==1.2.1
email-validator==2.0.0.post2
# via
# fastapi
# pydantic
fastapi==0.96.0
exceptiongroup==1.1.1
# via anyio
fastapi==0.98.0
# via
# -r requirements/../../../packages/service-library/requirements/_fastapi.in
# -r requirements/_base.in
frozenlist==1.3.0
# fastapi-pagination
fastapi-pagination==0.12.4
# via -r requirements/_base.in
frozenlist==1.3.3
# via
# aiohttp
# aiosignal
greenlet==2.0.2
# via sqlalchemy
h11==0.12.0
h11==0.14.0
# via
# httpcore
# uvicorn
httpcore==0.15.0
httpcore==0.17.2
# via httpx
httptools==0.2.0
httptools==0.5.0
# via uvicorn
httpx==0.24.0
httpx==0.24.1
# via
# -r requirements/../../../packages/service-library/requirements/_fastapi.in
# -r requirements/_base.in
# fastapi
idna==3.3
idna==3.4
# via
# anyio
# email-validator
Expand All @@ -121,19 +124,23 @@ jsonschema==3.2.0
# via
# -c requirements/../../../packages/service-library/requirements/././constraints.txt
# -r requirements/../../../packages/models-library/requirements/_base.in
mako==1.2.2
mako==1.2.4
# via
# -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
# alembic
markupsafe==2.1.1
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.3
# via
# jinja2
# mako
multidict==6.0.2
mdurl==0.1.2
# via markdown-it-py
multidict==6.0.4
# via
# aiohttp
# yarl
orjson==3.7.2
orjson==3.9.1
# via
# -r requirements/_base.in
# fastapi
Expand All @@ -143,54 +150,60 @@ packaging==23.1
# -r requirements/_base.in
pamqp==3.2.1
# via aiormq
pint==0.19.2
pint==0.22
# via -r requirements/../../../packages/simcore-sdk/requirements/_base.in
psycopg2-binary==2.9.6
# via
# aiopg
# sqlalchemy
pycparser==2.21
# via cffi
pydantic==1.9.0
pydantic==1.10.9
# via
# -r requirements/../../../packages/models-library/requirements/_base.in
# -r requirements/_base.in
# fastapi
pyinstrument==4.1.1
# fastapi-pagination
pygments==2.15.1
# via rich
pyinstrument==4.5.0
# via
# -c requirements/../../../packages/service-library/requirements/./_base.in
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
pyrsistent==0.18.1
pyrsistent==0.19.3
# via jsonschema
python-dateutil==2.8.2
# via arrow
python-dotenv==0.20.0
python-dotenv==1.0.0
# via
# pydantic
# uvicorn
python-multipart==0.0.5
python-multipart==0.0.6
# via fastapi
pyyaml==5.4.1
# via
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
# -r requirements/_base.in
# fastapi
# uvicorn
redis==4.5.4
redis==4.5.5
# via
# -c requirements/../../../packages/service-library/requirements/./_base.in
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
rich==13.4.2
# via
# -r requirements/../../../packages/settings-library/requirements/_base.in
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/_base.in
six==1.16.0
# via
# jsonschema
# python-dateutil
# python-multipart
sniffio==1.2.0
sniffio==1.3.0
# via
# anyio
# httpcore
# httpx
sqlalchemy==1.4.47
sqlalchemy==1.4.48
# via
# -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
# -r requirements/../../../packages/postgres-database/requirements/_base.in
Expand All @@ -200,36 +213,39 @@ starlette==0.27.0
# via
# -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
# fastapi
tenacity==8.0.1
tenacity==8.2.2
# via
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
# -r requirements/_base.in
tqdm==4.64.0
tqdm==4.65.0
# via
# -c requirements/../../../packages/service-library/requirements/./_base.in
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
typer==0.4.1
typer==0.9.0
# via
# -r requirements/../../../packages/settings-library/requirements/_base.in
# -r requirements/_base.in
typing-extensions==4.3.0
typing-extensions==4.6.3
# via
# aiodebug
# aiodocker
# alembic
# pint
# pydantic
ujson==5.5.0
# typer
ujson==5.8.0
# via
# -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
# fastapi
uvicorn==0.15.0
uvicorn==0.22.0
# via
# -r requirements/../../../packages/service-library/requirements/_fastapi.in
# fastapi
uvloop==0.16.0
uvloop==0.17.0
# via uvicorn
watchgod==0.8.2
watchfiles==0.19.0
# via uvicorn
websockets==10.2
websockets==11.0.3
# via uvicorn
yarl==1.9.2
# via
Expand Down
Loading