Merge branch 'master' into bugfix/replace-all

ITISFoundation · Aug 2, 2023 · 598bb14 · 598bb14
2 parents 4ef2307 + db2569e
commit 598bb14
Show file tree

Hide file tree

Showing 12 changed files with 335 additions and 212 deletions.
diff --git a/packages/service-library/requirements/_aiohttp.txt b/packages/service-library/requirements/_aiohttp.txt
@@ -2,13 +2,10 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=requirements/_aiohttp.txt --strip-extras requirements/_aiohttp.in
+#    pip-compile --output-file=requirements/_aiohttp.txt --resolver=backtracking --strip-extras requirements/_aiohttp.in
 #
 aiohttp==3.8.5
     # via
-    #   -c requirements/./../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../requirements/constraints.txt
     #   -r requirements/_aiohttp.in
     #   aiozipkin
 aiopg==1.4.0
@@ -118,21 +115,14 @@ psycopg2-binary==2.9.6
     #   sqlalchemy
 pydantic==1.10.11
     # via
-    #   -c requirements/./../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../requirements/constraints.txt
     #   -c requirements/./_base.in
     #   -r requirements/./../../../packages/models-library/requirements/_base.in
-    #   -r requirements/./../../../packages/settings-library/requirements/_base.in
 pygments==2.15.1
     # via rich
 python-dateutil==2.8.2
     # via arrow
 pyyaml==6.0.1
     # via
-    #   -c requirements/./../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../requirements/constraints.txt
     #   -c requirements/./_base.in
     #   jsonschema-spec
 referencing==0.29.3
@@ -163,9 +153,7 @@ sniffio==1.3.0
     #   httpcore
 sqlalchemy==1.4.49
     # via
-    #   -c requirements/./../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../requirements/constraints.txt
     #   aiopg
 typer==0.9.0
     # via -r requirements/./../../../packages/settings-library/requirements/_base.in
@@ -176,9 +164,7 @@ typing-extensions==4.7.1
     #   typer
 urllib3==2.0.4
     # via
-    #   -c requirements/./../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../requirements/constraints.txt
     #   requests
 werkzeug==2.3.6
     # via

diff --git a/packages/service-library/requirements/_base.in b/packages/service-library/requirements/_base.in
@@ -8,14 +8,15 @@
 --requirement ../../../packages/models-library/requirements/_base.in
 --requirement ../../../packages/settings-library/requirements/_base.in
 
+aio-pika
 aiodebug
 aiodocker
 aiofiles
-aio-pika
 arrow # date/time
-redis
 pydantic
 pyinstrument
 pyyaml
+redis
 tenacity
+toolz
 tqdm
diff --git a/packages/service-library/requirements/_base.txt b/packages/service-library/requirements/_base.txt
@@ -2,14 +2,10 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in
+#    pip-compile --output-file=requirements/_base.txt --resolver=backtracking --strip-extras requirements/_base.in
 #
 aio-pika==9.1.2
-    # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
-    #   -r requirements/_base.in
+    # via -r requirements/_base.in
 aiodebug==2.3.0
     # via -r requirements/_base.in
 aiodocker==0.21.0
@@ -18,9 +14,7 @@ aiofiles==23.1.0
     # via -r requirements/_base.in
 aiohttp==3.8.5
     # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
     #   aiodocker
 aiormq==6.7.6
     # via aio-pika
@@ -82,11 +76,7 @@ pamqp==3.2.1
     # via aiormq
 pydantic==1.10.11
     # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/../../../packages/models-library/requirements/_base.in
-    #   -r requirements/../../../packages/settings-library/requirements/_base.in
     #   -r requirements/_base.in
 pygments==2.15.1
     # via rich
@@ -95,17 +85,9 @@ pyinstrument==4.5.0
 python-dateutil==2.8.2
     # via arrow
 pyyaml==6.0.1
-    # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
-    #   -r requirements/_base.in
+    # via -r requirements/_base.in
 redis==4.6.0
-    # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
-    #   -r requirements/_base.in
+    # via -r requirements/_base.in
 referencing==0.29.3
     # via
     #   -c requirements/./constraints.txt
@@ -126,6 +108,8 @@ sniffio==1.3.0
     #   httpcore
 tenacity==8.2.2
     # via -r requirements/_base.in
+toolz==0.12.0
+    # via -r requirements/_base.in
 tqdm==4.65.0
     # via -r requirements/_base.in
 typer==0.9.0

diff --git a/packages/service-library/requirements/_fastapi.txt b/packages/service-library/requirements/_fastapi.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=requirements/_fastapi.txt --strip-extras requirements/_fastapi.in
+#    pip-compile --output-file=requirements/_fastapi.txt --resolver=backtracking --strip-extras requirements/_fastapi.in
 #
 anyio==3.7.1
     # via
@@ -31,11 +31,7 @@ email-validator==2.0.0.post2
 exceptiongroup==1.1.2
     # via anyio
 fastapi==0.99.1
-    # via
-    #   -c requirements/./../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../requirements/constraints.txt
-    #   -r requirements/_fastapi.in
+    # via -r requirements/_fastapi.in
 h11==0.14.0
     # via
     #   httpcore
@@ -45,11 +41,7 @@ httpcore==0.17.3
     #   dnspython
     #   httpx
 httpx==0.24.1
-    # via
-    #   -c requirements/./../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../requirements/constraints.txt
-    #   -r requirements/_fastapi.in
+    # via -r requirements/_fastapi.in
 idna==3.4
     # via
     #   anyio
@@ -65,12 +57,8 @@ mdurl==0.1.2
     # via markdown-it-py
 pydantic==1.10.11
     # via
-    #   -c requirements/./../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../requirements/constraints.txt
     #   -c requirements/./_base.in
     #   -r requirements/./../../../packages/models-library/requirements/_base.in
-    #   -r requirements/./../../../packages/settings-library/requirements/_base.in
     #   fastapi
 pygments==2.15.1
     # via rich
@@ -97,9 +85,7 @@ sniffio==1.3.0
     #   httpx
 starlette==0.27.0
     # via
-    #   -c requirements/./../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/./../../../requirements/constraints.txt
     #   fastapi
 typer==0.9.0
     # via -r requirements/./../../../packages/settings-library/requirements/_base.in

diff --git a/packages/service-library/requirements/_test.txt b/packages/service-library/requirements/_test.txt
@@ -2,45 +2,36 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in
+#    pip-compile --output-file=requirements/_test.txt --resolver=backtracking --strip-extras requirements/_test.in
 #
 aiohttp==3.8.5
     # via
-    #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   pytest-aiohttp
 aiosignal==1.3.1
     # via
     #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   aiohttp
 asgi-lifespan==2.1.0
     # via -r requirements/_test.in
 async-timeout==4.0.2
     # via
     #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   aiohttp
 attrs==23.1.0
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   aiohttp
     #   jsonschema
     #   pytest-docker
     #   referencing
 certifi==2023.5.7
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   requests
 charset-normalizer==3.2.0
     # via
     #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   aiohttp
     #   requests
 coverage==7.2.7
@@ -51,8 +42,6 @@ docker==6.1.3
     # via -r requirements/_test.in
 exceptiongroup==1.1.2
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   pytest
 execnet==2.0.2
@@ -64,22 +53,17 @@ flaky==3.7.0
 frozenlist==1.4.0
     # via
     #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   aiohttp
     #   aiosignal
 idna==3.4
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   requests
     #   yarl
 iniconfig==2.0.0
     # via pytest
 jsonschema==4.18.4
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   openapi-schema-validator
     #   openapi-spec-validator
@@ -89,8 +73,6 @@ jsonschema-spec==0.2.3
     #   openapi-spec-validator
 jsonschema-specifications==2023.7.1
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   jsonschema
     #   openapi-schema-validator
@@ -101,17 +83,14 @@ lazy-object-proxy==1.9.0
 multidict==6.0.4
     # via
     #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   aiohttp
     #   yarl
 openapi-schema-validator==0.6.0
     # via
     #   -c requirements/_aiohttp.txt
     #   openapi-spec-validator
 openapi-spec-validator==0.6.0
-    # via
-    #   -c requirements/_aiohttp.txt
-    #   -r requirements/_test.in
+    # via -r requirements/_test.in
 packaging==23.1
     # via
     #   docker
@@ -159,22 +138,16 @@ pytest-xdist==3.3.1
     # via -r requirements/_test.in
 python-dateutil==2.8.2
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   faker
 python-dotenv==1.0.0
     # via -r requirements/_test.in
 pyyaml==6.0.1
     # via
-    #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   jsonschema-spec
 referencing==0.29.3
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   jsonschema
     #   jsonschema-spec
@@ -190,22 +163,16 @@ rfc3339-validator==0.1.4
     #   openapi-schema-validator
 rpds-py==0.9.2
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   jsonschema
     #   referencing
 six==1.16.0
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   python-dateutil
     #   rfc3339-validator
 sniffio==1.3.0
     # via
-    #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_fastapi.txt
     #   asgi-lifespan
 termcolor==2.3.0
@@ -216,7 +183,6 @@ tomli==2.0.1
     #   pytest
 urllib3==2.0.4
     # via
-    #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_aiohttp.txt
     #   docker
     #   requests
@@ -225,5 +191,4 @@ websocket-client==1.6.1
 yarl==1.9.2
     # via
     #   -c requirements/_aiohttp.txt
-    #   -c requirements/_base.txt
     #   aiohttp
diff --git a/packages/service-library/requirements/_tools.txt b/packages/service-library/requirements/_tools.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in
+#    pip-compile --output-file=requirements/_tools.txt --resolver=backtracking --strip-extras requirements/_tools.in
 #
 astroid==2.15.6
     # via pylint
@@ -63,8 +63,6 @@ pyproject-hooks==1.0.0
     # via build
 pyyaml==6.0.1
     # via
-    #   -c requirements/../../../requirements/constraints.txt
-    #   -c requirements/_base.txt
     #   -c requirements/_test.txt
     #   pre-commit
 ruff==0.0.278