Skip to content

Commit aa945b2

Browse files
pcrespovpcrespov
authored
Maintenance/upgrade trafaret 2 (#1409)
* Updates servicelib reqs and changes to ToInt * updates trafaret in simcore-sdk * updates trafaret in storage * updates trafaret in web/server * Added extra tests to cover failures detected in submodule resource_management after the upgrade * Formatting and fixing bandit issue
1 parent 83eb8fa commit aa945b2

File tree

28 files changed

+152
-101
lines changed

28 files changed

+152
-101
lines changed

‎packages/service-library/requirements/_base.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --build-isolation _base.in
5+
# pip-compile --build-isolation requirements/_base.in
66
#
77
aiodebug==1.1.2 # via -r requirements/_base.in
88
aiohttp==3.6.2 # via -r requirements/_base.in, aiozipkin
@@ -11,7 +11,9 @@ aiozipkin==0.6.0 # via -r requirements/_base.in
1111
async-timeout==3.0.1 # via aiohttp
1212
attrs==19.3.0 # via -r requirements/_base.in, aiohttp, jsonschema, openapi-core
1313
chardet==3.0.4 # via aiohttp
14-
idna==2.8 # via yarl
14+
idna-ssl==1.1.0 # via aiohttp
15+
idna==2.8 # via idna-ssl, yarl
16+
importlib-metadata==1.5.2 # via jsonschema
1517
isodate==0.6.0 # via openapi-core
1618
jsonschema==3.2.0 # via -r requirements/_base.in, openapi-spec-validator
1719
lazy-object-proxy==1.4.1 # via openapi-core
@@ -27,9 +29,11 @@ sqlalchemy[postgresql_psycopg2binary]==1.3.4 # via -r requirements/_base.in, ai
2729
strict-rfc3339==0.7 # via openapi-core
2830
tenacity==6.1.0 # via -r requirements/_base.in
2931
trafaret==2.0.2 # via -r requirements/_base.in
32+
typing-extensions==3.7.4.1 # via aiohttp
3033
ujson==2.0.3 # via -r requirements/_base.in
3134
werkzeug==1.0.0 # via -r requirements/_base.in
3235
yarl==1.3.0 # via aiohttp
36+
zipp==3.1.0 # via importlib-metadata
3337

3438
# The following packages are considered to be unsafe in a requirements file:
3539
# setuptools

‎packages/service-library/requirements/_test.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --build-isolation _test.in
5+
# pip-compile --build-isolation requirements/_test.in
66
#
77
aiodebug==1.1.2 # via -r requirements/_base.txt
88
aiohttp==3.6.2 # via -r requirements/_base.txt, aiozipkin, pytest-aiohttp
@@ -16,7 +16,9 @@ chardet==3.0.4 # via -r requirements/_base.txt, aiohttp, requests
1616
coverage==5.0.3 # via -r requirements/_test.in, coveralls, pytest-cov
1717
coveralls==1.11.1 # via -r requirements/_test.in
1818
docopt==0.6.2 # via coveralls
19-
idna==2.8 # via -r requirements/_base.txt, requests, yarl
19+
idna-ssl==1.1.0 # via -r requirements/_base.txt, aiohttp
20+
idna==2.8 # via -r requirements/_base.txt, idna-ssl, requests, yarl
21+
importlib-metadata==1.5.2 # via -r requirements/_base.txt, jsonschema, pluggy, pytest
2022
isodate==0.6.0 # via -r requirements/_base.txt, openapi-core
2123
isort==4.3.21 # via pylint
2224
jsonschema==3.2.0 # via -r requirements/_base.txt, openapi-spec-validator
@@ -50,12 +52,15 @@ strict-rfc3339==0.7 # via -r requirements/_base.txt, openapi-core
5052
tenacity==6.1.0 # via -r requirements/_base.txt
5153
termcolor==1.1.0 # via pytest-sugar
5254
trafaret==2.0.2 # via -r requirements/_base.txt
55+
typed-ast==1.4.1 # via astroid
56+
typing-extensions==3.7.4.1 # via -r requirements/_base.txt, aiohttp
5357
ujson==2.0.3 # via -r requirements/_base.txt
5458
urllib3==1.25.8 # via requests
5559
wcwidth==0.1.8 # via pytest
5660
werkzeug==1.0.0 # via -r requirements/_base.txt
5761
wrapt==1.11.2 # via astroid
5862
yarl==1.3.0 # via -r requirements/_base.txt, aiohttp
63+
zipp==3.1.0 # via -r requirements/_base.txt, importlib-metadata
5964

6065
# The following packages are considered to be unsafe in a requirements file:
6166
# setuptools

‎packages/service-library/src/servicelib/tracing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def setup_tracing(
3131

3232
schema = T.Dict(
3333
{
34-
T.Key("enabled", default=True, optional=True): T.Or(T.Bool(), T.Int),
34+
T.Key("enabled", default=True, optional=True): T.Or(T.Bool(), T.ToInt),
3535
T.Key("zipkin_endpoint", default="http://jaeger:9411"): T.String(),
3636
}
3737
)

‎packages/simcore-sdk/requirements/_base.txt

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --output-file=_base.txt _base.in
5+
# pip-compile --build-isolation _base.in
66
#
7-
aiofiles==0.4.0
8-
aiohttp==3.6.2
7+
aiofiles==0.4.0 # via -r _base.in
8+
aiohttp==3.6.2 # via -r _base.in
99
async-timeout==3.0.1 # via aiohttp
1010
attrs==19.1.0 # via aiohttp
1111
chardet==3.0.4 # via aiohttp
1212
decorator==4.4.0 # via networkx
1313
idna-ssl==1.1.0 # via aiohttp
1414
idna==2.8 # via idna-ssl, yarl
1515
multidict==4.5.2 # via aiohttp, yarl
16-
networkx==2.3
17-
pika==1.0.1
18-
psycopg2-binary==2.8.4
19-
pyyaml==5.3
16+
networkx==2.3 # via -r _base.in
17+
pika==1.0.1 # via -r _base.in
18+
psycopg2-binary==2.8.4 # via -r _base.in
19+
pyyaml==5.3 # via -r _base.in, trafaret-config
2020
six==1.12.0 # via tenacity
21-
sqlalchemy==1.3.3
22-
tenacity==6.0.0
23-
trafaret-config==2.0.2
24-
trafaret==1.2.0 # via trafaret-config
21+
sqlalchemy==1.3.3 # via -r _base.in
22+
tenacity==6.0.0 # via -r _base.in
23+
trafaret-config==2.0.2 # via -r _base.in
24+
trafaret==2.0.2 # via trafaret-config
2525
typing-extensions==3.7.2 # via aiohttp
2626
yarl==1.3.0 # via aiohttp

‎packages/simcore-sdk/requirements/_test.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --build-isolation --output-file=_test.txt _test.in
5+
# pip-compile --build-isolation _test.in
66
#
77
aiofiles==0.4.0 # via -r _base.txt
88
aiohttp==3.6.2 # via -r _base.txt, pytest-aiohttp
@@ -48,7 +48,7 @@ sqlalchemy==1.3.3 # via -r _base.txt
4848
tenacity==6.0.0 # via -r _base.txt
4949
termcolor==1.1.0 # via pytest-sugar
5050
trafaret-config==2.0.2 # via -r _base.txt
51-
trafaret==1.2.0 # via -r _base.txt, trafaret-config
51+
trafaret==2.0.2 # via -r _base.txt, trafaret-config
5252
typed-ast==1.4.1 # via astroid
5353
typing-extensions==3.7.2 # via -r _base.txt, aiohttp
5454
urllib3==1.25.8 # via requests

‎packages/simcore-sdk/src/simcore_sdk/config/db.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"database": T.String(),
1010
"user": T.String(),
1111
"password": T.String(),
12-
T.Key("minsize", default=1 ,optional=True): T.Int(),
13-
T.Key("maxsize", default=4, optional=True): T.Int(),
12+
T.Key("minsize", default=1 ,optional=True): T.ToInt(),
13+
T.Key("maxsize", default=4, optional=True): T.ToInt(),
1414
"host": T.Or( T.String, T.Null),
15-
"port": T.Or( T.Int, T.Null),
15+
"port": T.Or( T.ToInt, T.Null),
1616
"endpoint": T.Or( T.String, T.Null)
1717
})
1818

‎packages/simcore-sdk/src/simcore_sdk/config/rabbit.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
T.Key("name", default="tasks", optional=True): T.String(),
1616
T.Key("enabled", default=True, optional=True): T.Bool(),
1717
T.Key("host", default='rabbit', optional=True): T.String(),
18-
T.Key("port", default=5672, optional=True): T.Int(),
18+
T.Key("port", default=5672, optional=True): T.ToInt(),
1919
"user": T.String(),
2020
"password": T.String(),
2121
"channels": T.Dict({

‎packages/simcore-sdk/src/simcore_sdk/config/s3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"access_key": T.String(),
1515
"secret_key": T.String(),
1616
"bucket_name": T.String(),
17-
T.Key("secure", default=0): T.Int(),
17+
T.Key("secure", default=0): T.ToInt(),
1818
})
1919

2020

‎services/storage/requirements/_base.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ sqlalchemy[postgresql_psycopg2binary]==1.3.3 # via -r ../../../packages/postgre
5757
strict-rfc3339==0.7 # via openapi-core
5858
tenacity==6.0.0 # via -r ../../../packages/service-library/requirements/_base.in, -r _base.in
5959
trafaret-config==2.0.2 # via -r _base.in
60-
trafaret==1.2.0 # via -r ../../../packages/service-library/requirements/_base.in, -r _base.in, trafaret-config
60+
trafaret==2.0.2 # via -r ../../../packages/service-library/requirements/_base.in, -r _base.in, trafaret-config
6161
typing-extensions==3.7.2 # via aiohttp
6262
ujson==1.35 # via -r ../../../packages/service-library/requirements/_base.in
6363
urllib3==1.25.8 # via -r _base.in, botocore, requests

‎services/storage/requirements/_test.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ strict-rfc3339==0.7 # via -r _base.txt, openapi-core
8282
tenacity==6.0.0 # via -r _base.txt
8383
termcolor==1.1.0 # via pytest-sugar
8484
trafaret-config==2.0.2 # via -r _base.txt
85-
trafaret==1.2.0 # via -r _base.txt, trafaret-config
85+
trafaret==2.0.2 # via -r _base.txt, trafaret-config
8686
typed-ast==1.4.1 # via astroid
8787
typing-extensions==3.7.2 # via -r _base.txt, aiohttp
8888
ujson==1.35 # via -r _base.txt

‎services/storage/src/simcore_service_storage/config_schema.py

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1+
import os
2+
13
import trafaret as T
4+
25
from servicelib.config_schema_utils import addon_section
36
from servicelib.tracing import schema as tracing_schema
47
from simcore_sdk.config import db, s3
58

69
from . import rest_config
710

11+
runs_in_container = "SC_BUILD_TARGET" in os.environ
12+
813
app_schema = T.Dict(
914
{
10-
T.Key("host", default="0.0.0.0"): T.IP,
11-
"port": T.Int(),
15+
T.Key(
16+
"host", default="0.0.0.0" if runs_in_container else "127.0.0.1" # nosec
17+
): T.IP,
18+
"port": T.ToInt(),
1219
"log_level": T.Enum(
1320
"DEBUG", "WARNING", "INFO", "ERROR", "CRITICAL", "FATAL", "NOTSET"
1421
),
1522
"testing": T.Bool(),
16-
T.Key("max_workers", default=8, optional=True): T.Int(),
23+
T.Key("max_workers", default=8, optional=True): T.ToInt(),
1724
T.Key("monitoring_enabled", default=False): T.Or(
18-
T.Bool(), T.Int
25+
T.Bool(), T.ToInt
1926
), # Int added to use environs
2027
T.Key("test_datcore", optional=True): T.Dict(
2128
{"token_key": T.String(), "token_secret": T.String()}

‎services/storage/src/simcore_service_storage/datcore.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
from blackfynn import Blackfynn
1616
from blackfynn.models import BaseCollection, Collection, DataPackage
17-
from simcore_service_storage.models import (DatasetMetaData, FileMetaData,
18-
FileMetaDataEx)
17+
from simcore_service_storage.models import DatasetMetaData, FileMetaData, FileMetaDataEx
1918
from simcore_service_storage.settings import DATCORE_ID, DATCORE_STR
2019

2120
logger = logging.getLogger(__name__)

‎services/storage/src/simcore_service_storage/dsm.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,8 @@ class DataStorageManager:
144144
# TODO: perhaps can be used a cache? add a lifetime?
145145

146146
def _get_datcore_tokens(self, user_id: str) -> Tuple[str, str]:
147-
# pylint: disable=no-member
148-
token = self.datcore_tokens.get(
149-
user_id, DatCoreApiToken()
150-
)
147+
# pylint: disable=no-member
148+
token = self.datcore_tokens.get(user_id, DatCoreApiToken())
151149
return token.to_tuple()
152150

153151
async def locations(self, user_id: str):

‎services/storage/src/simcore_service_storage/handlers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,9 @@ async def create_folders_from_project(request: web.Request):
305305
nodes_map = body.get("nodes_map", {})
306306

307307
assert set(nodes_map.keys()) == set(source_project["workbench"].keys()) # nosec
308-
assert set(nodes_map.values()) == set( # nosec
308+
assert set(nodes_map.values()) == set( # nosec
309309
destination_project["workbench"].keys() # nosec
310-
) # nosec
310+
) # nosec
311311

312312
# TODO: validate project with jsonschema instead??
313313
params = {"location_id": SIMCORE_S3_ID}

‎services/storage/tests/test_configs.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ def devel_environ(env_devel_file):
4747

4848
variable_expansion_pattern = re.compile(r"\$\{*(\w+)+[:-]*(\w+)*\}")
4949

50+
5051
@pytest.mark.parametrize(
5152
"sample,expected_match",
5253
[
5354
(r"${varname:-default}", ("varname", "default")),
5455
(r"${varname}", ("varname", None)),
5556
(r"33", None),
5657
(r"${VAR_name:-33}", ("VAR_name", "33")),
57-
(r"${varname-default}", ("varname", "default")), # this is not standard!
58-
(r"${varname:default}", ("varname", "default")), # this is not standard!
58+
(r"${varname-default}", ("varname", "default")), # this is not standard!
59+
(r"${varname:default}", ("varname", "default")), # this is not standard!
5960
],
6061
)
6162
def test_variable_expansions(sample, expected_match):

‎services/web/server/requirements/_base.txt

+35-35
Original file line numberDiff line numberDiff line change
@@ -2,71 +2,71 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --output-file=_base.txt _base.in
5+
# pip-compile --build-isolation _base.in
66
#
7-
aio-pika==6.5.2 # via -r _base.in (line 12)
8-
aiodebug==1.1.2 # via -r _base.in (line 34)
9-
aiohttp-jinja2==1.1.1 # via -r _base.in (line 14)
10-
aiohttp-security==0.4.0 # via -r _base.in (line 16)
11-
aiohttp-session[secure]==2.7.0 # via -r _base.in (line 15)
12-
aiohttp-swagger[performance]==1.0.14 # via -r _base.in (line 17)
13-
aiohttp==3.6.2 # via -r ../../../../packages/service-library/requirements/_base.in (line 10), -r _base.in (line 13), aiohttp-jinja2, aiohttp-security, aiohttp-session, aiohttp-swagger, aiozipkin
14-
aiopg[sa]==1.0.0 # via -r ../../../../packages/service-library/requirements/_base.in (line 11), -r _base.in (line 18)
15-
aioredis==1.3.0 # via -r _base.in (line 19)
7+
aio-pika==6.5.2 # via -r _base.in
8+
aiodebug==1.1.2 # via -r ../../../../packages/service-library/requirements/_base.in, -r _base.in
9+
aiohttp-jinja2==1.1.1 # via -r _base.in
10+
aiohttp-security==0.4.0 # via -r _base.in
11+
aiohttp-session[secure]==2.7.0 # via -r _base.in
12+
aiohttp-swagger[performance]==1.0.14 # via -r _base.in
13+
aiohttp==3.6.2 # via -r ../../../../packages/service-library/requirements/_base.in, -r _base.in, aiohttp-jinja2, aiohttp-security, aiohttp-session, aiohttp-swagger, aiozipkin
14+
aiopg[sa]==1.0.0 # via -r ../../../../packages/service-library/requirements/_base.in, -r _base.in
15+
aioredis==1.3.0 # via -r _base.in
1616
aiormq==3.2.1 # via aio-pika
17-
aiosmtplib==1.0.5 # via -r _base.in (line 20)
18-
aiozipkin==0.6.0 # via -r ../../../../packages/service-library/requirements/_base.in (line 12)
17+
aiosmtplib==1.0.5 # via -r _base.in
18+
aiozipkin==0.6.0 # via -r ../../../../packages/service-library/requirements/_base.in
1919
amqp==2.4.2 # via kombu
2020
asn1crypto==0.24.0 # via cryptography
2121
async-timeout==3.0.1 # via aiohttp, aioredis
22-
asyncpg==0.18.3 # via -r _base.in (line 21)
23-
attrs==19.1.0 # via -r ../../../../packages/service-library/requirements/_base.in (line 19), aiohttp, jsonschema, openapi-core
22+
asyncpg==0.18.3 # via -r _base.in
23+
attrs==19.1.0 # via -r ../../../../packages/service-library/requirements/_base.in, aiohttp, jsonschema, openapi-core
2424
billiard==3.6.0.0 # via celery
25-
celery==4.3.0 # via -r _base.in (line 22)
25+
celery==4.3.0 # via -r _base.in
2626
cffi==1.12.3 # via cryptography
27-
change-case==0.5.2 # via -r _base.in (line 24)
27+
change-case==0.5.2 # via -r _base.in
2828
chardet==3.0.4 # via aiohttp
29-
cryptography==2.6.1 # via -r _base.in (line 23), aiohttp-session
30-
expiringdict==1.2.0 # via -r _base.in (line 25)
29+
cryptography==2.6.1 # via -r _base.in, aiohttp-session
30+
expiringdict==1.2.0 # via -r _base.in
3131
hiredis==1.0.1 # via aioredis
3232
idna-ssl==1.1.0 # via aiohttp
3333
idna==2.8 # via idna-ssl, yarl
3434
importlib-metadata==0.23 # via jsonschema
3535
isodate==0.6.0 # via openapi-core
36-
jinja-app-loader==1.0.2 # via -r _base.in (line 26)
36+
jinja-app-loader==1.0.2 # via -r _base.in
3737
jinja2==2.10.1 # via aiohttp-jinja2, aiohttp-swagger
38-
jsondiff==1.1.2 # via -r _base.in (line 27)
39-
jsonschema==3.2.0 # via -r ../../../../packages/service-library/requirements/_base.in (line 15), openapi-spec-validator
38+
jsondiff==1.1.2 # via -r _base.in
39+
jsonschema==3.2.0 # via -r ../../../../packages/service-library/requirements/_base.in, openapi-spec-validator
4040
kombu==4.5.0 # via celery
4141
lazy-object-proxy==1.4.3 # via openapi-core
4242
markupsafe==1.1.1 # via jinja2
4343
more-itertools==7.2.0 # via zipp
4444
multidict==4.5.2 # via aiohttp, yarl
45-
openapi-core==0.12.0 # via -r ../../../../packages/service-library/requirements/_base.in (line 16)
45+
openapi-core==0.12.0 # via -r ../../../../packages/service-library/requirements/_base.in
4646
openapi-spec-validator==0.2.8 # via openapi-core
4747
pamqp==2.3.0 # via aiormq
48-
passlib==1.7.1 # via -r _base.in (line 28)
49-
prometheus-client==0.7.1 # via -r ../../../../packages/service-library/requirements/_base.in (line 17)
50-
psycopg2-binary==2.8.4 # via -r ../../../../packages/service-library/requirements/_base.in (line 7), -r _base.in (line 8), aiopg, sqlalchemy
48+
passlib==1.7.1 # via -r _base.in
49+
prometheus-client==0.7.1 # via -r ../../../../packages/service-library/requirements/_base.in
50+
psycopg2-binary==2.8.4 # via -r ../../../../packages/service-library/requirements/_base.in, -r _base.in, aiopg, sqlalchemy
5151
pycparser==2.19 # via cffi
5252
pyrsistent==0.15.6 # via jsonschema
5353
python-engineio==3.9.3 # via python-socketio
54-
python-socketio==4.3.1 # via -r _base.in (line 29)
54+
python-socketio==4.3.1 # via -r _base.in
5555
pytz==2019.1 # via celery
56-
pyyaml==5.3 # via -r ../../../../packages/service-library/requirements/_base.in (line 6), aiohttp-swagger, openapi-spec-validator, trafaret-config
57-
semantic-version==2.6.0 # via -r _base.in (line 30)
56+
pyyaml==5.3 # via -r ../../../../packages/service-library/requirements/_base.in, aiohttp-swagger, openapi-spec-validator, trafaret-config
57+
semantic-version==2.6.0 # via -r _base.in
5858
six==1.12.0 # via cryptography, isodate, jsonschema, openapi-core, openapi-spec-validator, pyrsistent, python-engineio, python-socketio, tenacity
59-
sqlalchemy[postgresql_psycopg2binary]==1.3.4 # via -r ../../../../packages/postgres-database/requirements/_base.in (line 7), -r ../../../../packages/service-library/requirements/_base.in (line 5), -r _base.in (line 9), aiopg
59+
sqlalchemy[postgresql_psycopg2binary]==1.3.4 # via -r ../../../../packages/postgres-database/requirements/_base.in, -r ../../../../packages/service-library/requirements/_base.in, -r _base.in, aiopg
6060
strict-rfc3339==0.7 # via openapi-core
61-
tenacity==6.0.0 # via -r ../../../../packages/service-library/requirements/_base.in (line 18), -r _base.in (line 31)
62-
trafaret-config==2.0.2 # via -r _base.in (line 33)
63-
trafaret==1.2.0 # via -r ../../../../packages/service-library/requirements/_base.in (line 20), -r _base.in (line 32), trafaret-config
61+
tenacity==6.0.0 # via -r ../../../../packages/service-library/requirements/_base.in, -r _base.in
62+
trafaret-config==2.0.2 # via -r _base.in
63+
trafaret==2.0.2 # via -r ../../../../packages/service-library/requirements/_base.in, -r _base.in, trafaret-config
6464
typing-extensions==3.7.2 # via aiohttp
6565
typing==3.7.4.1 # via expiringdict
66-
ujson==1.35 # via -r ../../../../packages/service-library/requirements/_base.in (line 13), aiohttp-swagger
66+
ujson==1.35 # via -r ../../../../packages/service-library/requirements/_base.in, aiohttp-swagger
6767
vine==1.3.0 # via amqp, celery
68-
werkzeug==0.16.0 # via -r ../../../../packages/service-library/requirements/_base.in (line 14)
69-
yarl==1.3.0 # via -r ../../../../packages/postgres-database/requirements/_base.in (line 9), aio-pika, aiohttp, aiormq
68+
werkzeug==0.16.0 # via -r ../../../../packages/service-library/requirements/_base.in
69+
yarl==1.3.0 # via -r ../../../../packages/postgres-database/requirements/_base.in, aio-pika, aiohttp, aiormq
7070
zipp==1.0.0 # via importlib-metadata
7171

7272
# The following packages are considered to be unsafe in a requirements file:

‎services/web/server/requirements/_test.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --build-isolation --output-file=_test.txt _test.in
5+
# pip-compile --build-isolation _test.in
66
#
77
aio-pika==6.5.2 # via -r _base.txt
88
aiodebug==1.1.2 # via -r _base.txt
@@ -90,7 +90,7 @@ tenacity==6.0.0 # via -r _base.txt, -r _test.in
9090
termcolor==1.1.0 # via pytest-sugar
9191
text-unidecode==1.3 # via faker
9292
trafaret-config==2.0.2 # via -r _base.txt
93-
trafaret==1.2.0 # via -r _base.txt, trafaret-config
93+
trafaret==2.0.2 # via -r _base.txt, trafaret-config
9494
typed-ast==1.4.1 # via astroid
9595
typing-extensions==3.7.2 # via -r _base.txt, aiohttp
9696
typing==3.7.4.1 # via -r _base.txt, expiringdict

0 commit comments

Comments
 (0)