adds ujson repo-wide constraints

ITISFoundation · Jul 18, 2022 · 055a24f · 055a24f
1 parent 03c98c8
commit 055a24f
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 8 deletions.
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -18,6 +18,7 @@ pyyaml>=5.4                                   # https://github.com/advisories/GH
 rsa>=4.1                                      # https://github.com/advisories/GHSA-537h-rv9q-vvph
 sqlalchemy[postgresql_psycopg2binary]>=1.3.3  # https://nvd.nist.gov/vuln/detail/CVE-2019-7164
 sqlalchemy>=1.3.3                             # https://nvd.nist.gov/vuln/detail/CVE-2019-7164
+ujson>=5.4.0                                  # https://github.com/advisories/GHSA-fh56-85cw-5pq6, https://github.com/advisories/GHSA-wpqr-jcpx-745r
 urllib3>=1.26.5                               # https://github.com/advisories/GHSA-q2q7-5pp4-w6pg
 
 #

diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt
@@ -322,8 +322,20 @@ typing-extensions==4.2.0
     #   aiodebug
     #   pydantic
     #   starlette
-ujson==5.3.0
-    # via fastapi
+ujson==5.4.0
+    # via
+    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
+    #   fastapi
 urllib3==1.26.9
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt

diff --git a/services/api-server/tests/unit/test__fastapi.py b/services/api-server/tests/unit/test__fastapi.py
@@ -114,6 +114,12 @@ def test_fastapi_route_paths_in_paths(client: TestClient, faker: Faker):
 
 
 def test_fastapi_route_name_parsing(client: TestClient, faker: Faker):
+    #
+    # Ensures colon are allowed in routes
+    # - Issue in  https://github.com/encode/starlette/pull/1657
+    # - FIX released  https://github.com/encode/starlette/releases/tag/0.20.2
+    # BUT fastapi starlette==0.19.1 https://github.com/tiangolo/fastapi/blob/master/pyproject.toml#L38
+    # Waiting for https://github.com/tiangolo/fastapi/issues/4892
 
     solver_key = Solver.Config.schema_extra["example"]["id"]
     version = Solver.Config.schema_extra["example"]["version"]

diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt
@@ -224,8 +224,15 @@ typing-extensions==4.2.0
     #   aioredis
     #   pydantic
     #   starlette
-ujson==5.3.0
-    # via fastapi
+ujson==5.4.0
+    # via
+    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
+    #   fastapi
 urllib3==1.26.9
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt

diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt
@@ -422,8 +422,22 @@ typing-extensions==4.2.0
     #   aioredis
     #   pydantic
     #   starlette
-ujson==5.3.0
-    # via fastapi
+ujson==5.4.0
+    # via
+    #   -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
+    #   fastapi
 urllib3==1.26.9
     # via
     #   -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt

diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt
@@ -216,8 +216,15 @@ typing-extensions==4.2.0
     #   pydantic
     #   types-aiobotocore
     #   types-aiobotocore-s3
-ujson==5.3.0
-    # via aiohttp-swagger
+ujson==5.4.0
+    # via
+    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt
+    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
+    #   aiohttp-swagger
 urllib3==1.26.9
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt