Skip to content

Commit 7202fbf

Browse files
committed
upgraded servicelib reqs
1 parent 57da748 commit 7202fbf

File tree

3 files changed

+79
-70
lines changed

3 files changed

+79
-70
lines changed

packages/service-library/requirements/_base.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
# Specifies third-party dependencies for 'service-library'
33
#
44

5-
sqlalchemy>=1.3.3 # https://nvd.nist.gov/vuln/detail/CVE-2019-7164
6-
pyyaml>=5.3 # Vulnerable
7-
psycopg2-binary # enforces binary version - http://initd.org/psycopg/docs/install.html#binary-install-from-pypi
5+
sqlalchemy>=1.3.3 # https://nvd.nist.gov/vuln/detail/CVE-2019-7164
6+
pyyaml>=5.3 # Vulnerable
7+
psycopg2-binary # enforces binary version - http://initd.org/psycopg/docs/install.html#binary-install-from-pypi
8+
openapi-core==0.12.0 # frozen until https://github.com/ITISFoundation/osparc-simcore/pull/1396 is CLOSED
89

910

1011
aiohttp
@@ -13,9 +14,8 @@ aiozipkin
1314
ujson
1415
werkzeug
1516
jsonschema
16-
openapi-core
17-
prometheus_client # TODO: add as optional service-library[monitoring]
17+
prometheus_client
1818
tenacity
1919
attrs
2020
trafaret
21-
aiodebug
21+
aiodebug

packages/service-library/requirements/_base.txt

+27-23
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,38 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --build-isolation requirements/_base.in
5+
# pip-compile --build-isolation --output-file=_base.txt _base.in
66
#
7-
aiodebug==1.1.2 # via -r requirements/_base.in
8-
aiohttp==3.6.2 # via -r requirements/_base.in, aiozipkin
9-
aiopg[sa]==1.0.0 # via -r requirements/_base.in
10-
aiozipkin==0.6.0 # via -r requirements/_base.in
7+
aiodebug==1.1.2 # via -r _base.in
8+
aiohttp==3.6.2 # via -r _base.in, aiozipkin
9+
aiopg[sa]==1.0.0 # via -r _base.in
10+
aiozipkin==0.6.0 # via -r _base.in
1111
async-timeout==3.0.1 # via aiohttp
12-
attrs==19.3.0 # via -r requirements/_base.in, aiohttp, jsonschema, openapi-core
12+
attrs==19.3.0 # via -r _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.9 # via idna-ssl, yarl
16+
importlib-metadata==1.6.0 # via jsonschema
1517
isodate==0.6.0 # via openapi-core
16-
jsonschema==3.2.0 # via -r requirements/_base.in, openapi-spec-validator
17-
lazy-object-proxy==1.4.1 # via openapi-core
18-
multidict==4.5.2 # via aiohttp, yarl
19-
openapi-core==0.12.0 # via -r requirements/_base.in
20-
openapi-spec-validator==0.2.7 # via openapi-core
21-
prometheus-client==0.7.1 # via -r requirements/_base.in
22-
psycopg2-binary==2.8.4 # via -r requirements/_base.in, aiopg, sqlalchemy
23-
pyrsistent==0.15.2 # via jsonschema
24-
pyyaml==5.3 # via -r requirements/_base.in, openapi-spec-validator
25-
six==1.12.0 # via isodate, jsonschema, openapi-core, openapi-spec-validator, pyrsistent, tenacity
26-
sqlalchemy[postgresql_psycopg2binary]==1.3.4 # via -r requirements/_base.in, aiopg
18+
jsonschema==3.2.0 # via -r _base.in, openapi-spec-validator
19+
lazy-object-proxy==1.4.3 # via openapi-core
20+
multidict==4.7.5 # via aiohttp, yarl
21+
openapi-core==0.12.0 # via -r _base.in
22+
openapi-spec-validator==0.2.8 # via openapi-core
23+
prometheus-client==0.7.1 # via -r _base.in
24+
psycopg2-binary==2.8.5 # via -r _base.in, aiopg, sqlalchemy
25+
pyrsistent==0.16.0 # via jsonschema
26+
pyyaml==5.3.1 # via -r _base.in, openapi-spec-validator
27+
six==1.14.0 # via isodate, jsonschema, openapi-core, openapi-spec-validator, pyrsistent, tenacity
28+
sqlalchemy[postgresql_psycopg2binary]==1.3.15 # via -r _base.in, aiopg
2729
strict-rfc3339==0.7 # via openapi-core
28-
tenacity==6.1.0 # via -r requirements/_base.in
29-
trafaret==2.0.2 # via -r requirements/_base.in
30-
ujson==2.0.3 # via -r requirements/_base.in
31-
werkzeug==1.0.1 # via -r requirements/_base.in
32-
yarl==1.3.0 # via aiohttp
30+
tenacity==6.1.0 # via -r _base.in
31+
trafaret==2.0.2 # via -r _base.in
32+
typing-extensions==3.7.4.2 # via aiohttp
33+
ujson==2.0.3 # via -r _base.in
34+
werkzeug==1.0.1 # via -r _base.in
35+
yarl==1.4.2 # 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

+46-41
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,65 @@
22
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
5-
# pip-compile --build-isolation requirements/_test.in
5+
# pip-compile --build-isolation --output-file=_test.txt _test.in
66
#
7-
aiodebug==1.1.2 # via -r requirements/_base.txt
8-
aiohttp==3.6.2 # via -r requirements/_base.txt, aiozipkin, pytest-aiohttp
9-
aiopg[sa]==1.0.0 # via -r requirements/_base.txt
10-
aiozipkin==0.6.0 # via -r requirements/_base.txt
7+
aiodebug==1.1.2 # via -r _base.txt
8+
aiohttp==3.6.2 # via -r _base.txt, aiozipkin, pytest-aiohttp
9+
aiopg[sa]==1.0.0 # via -r _base.txt
10+
aiozipkin==0.6.0 # via -r _base.txt
1111
astroid==2.3.3 # via pylint
12-
async-timeout==3.0.1 # via -r requirements/_base.txt, aiohttp
13-
attrs==19.3.0 # via -r requirements/_base.txt, aiohttp, jsonschema, openapi-core, pytest, pytest-docker
14-
certifi==2019.11.28 # via requests
15-
chardet==3.0.4 # via -r requirements/_base.txt, aiohttp, requests
16-
coverage==5.0.3 # via -r requirements/_test.in, coveralls, pytest-cov
17-
coveralls==1.11.1 # via -r requirements/_test.in
12+
async-timeout==3.0.1 # via -r _base.txt, aiohttp
13+
attrs==19.3.0 # via -r _base.txt, aiohttp, jsonschema, openapi-core, pytest, pytest-docker
14+
certifi==2020.4.5.1 # via requests
15+
chardet==3.0.4 # via -r _base.txt, aiohttp, requests
16+
coverage==5.0.3 # via -r _test.in, coveralls, pytest-cov
17+
coveralls==2.0.0 # via -r _test.in
1818
docopt==0.6.2 # via coveralls
19-
idna==2.8 # via -r requirements/_base.txt, requests, yarl
20-
isodate==0.6.0 # via -r requirements/_base.txt, openapi-core
19+
idna-ssl==1.1.0 # via -r _base.txt, aiohttp
20+
idna==2.9 # via -r _base.txt, idna-ssl, requests, yarl
21+
importlib-metadata==1.6.0 # via -r _base.txt, jsonschema, pluggy, pytest
22+
isodate==0.6.0 # via -r _base.txt, openapi-core
2123
isort==4.3.21 # via pylint
22-
jsonschema==3.2.0 # via -r requirements/_base.txt, openapi-spec-validator
23-
lazy-object-proxy==1.4.1 # via -r requirements/_base.txt, astroid, openapi-core
24+
jsonschema==3.2.0 # via -r _base.txt, openapi-spec-validator
25+
lazy-object-proxy==1.4.3 # via -r _base.txt, astroid, openapi-core
2426
mccabe==0.6.1 # via pylint
2527
more-itertools==8.2.0 # via pytest
26-
multidict==4.5.2 # via -r requirements/_base.txt, aiohttp, yarl
27-
openapi-core==0.12.0 # via -r requirements/_base.txt
28-
openapi-spec-validator==0.2.7 # via -r requirements/_base.txt, openapi-core
28+
multidict==4.7.5 # via -r _base.txt, aiohttp, yarl
29+
openapi-core==0.12.0 # via -r _base.txt
30+
openapi-spec-validator==0.2.8 # via -r _base.txt, openapi-core
2931
packaging==20.3 # via pytest, pytest-sugar
3032
pluggy==0.13.1 # via pytest
31-
prometheus-client==0.7.1 # via -r requirements/_base.txt
32-
psycopg2-binary==2.8.4 # via -r requirements/_base.txt, aiopg, sqlalchemy
33+
prometheus-client==0.7.1 # via -r _base.txt
34+
psycopg2-binary==2.8.5 # via -r _base.txt, aiopg, sqlalchemy
3335
py==1.8.1 # via pytest
34-
pylint==2.4.4 # via -r requirements/_test.in
35-
pyparsing==2.4.6 # via packaging
36-
pyrsistent==0.15.2 # via -r requirements/_base.txt, jsonschema
37-
pytest-aiohttp==0.3.0 # via -r requirements/_test.in
38-
pytest-cov==2.8.1 # via -r requirements/_test.in
39-
pytest-docker==0.7.2 # via -r requirements/_test.in
40-
pytest-instafail==0.4.1.post0 # via -r requirements/_test.in
41-
pytest-mock==3.0.0 # via -r requirements/_test.in
42-
pytest-runner==5.2 # via -r requirements/_test.in
43-
pytest-sugar==0.9.2 # via -r requirements/_test.in
44-
pytest==5.3.5 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
45-
pyyaml==5.3 # via -r requirements/_base.txt, openapi-spec-validator
36+
pylint==2.4.4 # via -r _test.in
37+
pyparsing==2.4.7 # via packaging
38+
pyrsistent==0.16.0 # via -r _base.txt, jsonschema
39+
pytest-aiohttp==0.3.0 # via -r _test.in
40+
pytest-cov==2.8.1 # via -r _test.in
41+
pytest-docker==0.7.2 # via -r _test.in
42+
pytest-instafail==0.4.1.post0 # via -r _test.in
43+
pytest-mock==3.0.0 # via -r _test.in
44+
pytest-runner==5.2 # via -r _test.in
45+
pytest-sugar==0.9.2 # via -r _test.in
46+
pytest==5.3.5 # via -r _test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
47+
pyyaml==5.3.1 # via -r _base.txt, openapi-spec-validator
4648
requests==2.23.0 # via coveralls
47-
six==1.12.0 # via -r requirements/_base.txt, astroid, isodate, jsonschema, openapi-core, openapi-spec-validator, packaging, pyrsistent, tenacity
48-
sqlalchemy[postgresql_psycopg2binary]==1.3.4 # via -r requirements/_base.txt, aiopg
49-
strict-rfc3339==0.7 # via -r requirements/_base.txt, openapi-core
50-
tenacity==6.1.0 # via -r requirements/_base.txt
49+
six==1.14.0 # via -r _base.txt, astroid, isodate, jsonschema, openapi-core, openapi-spec-validator, packaging, pyrsistent, tenacity
50+
sqlalchemy[postgresql_psycopg2binary]==1.3.15 # via -r _base.txt, aiopg
51+
strict-rfc3339==0.7 # via -r _base.txt, openapi-core
52+
tenacity==6.1.0 # via -r _base.txt
5153
termcolor==1.1.0 # via pytest-sugar
52-
trafaret==2.0.2 # via -r requirements/_base.txt
53-
ujson==2.0.3 # via -r requirements/_base.txt
54+
trafaret==2.0.2 # via -r _base.txt
55+
typed-ast==1.4.1 # via astroid
56+
typing-extensions==3.7.4.2 # via -r _base.txt, aiohttp
57+
ujson==2.0.3 # via -r _base.txt
5458
urllib3==1.25.8 # via requests
55-
wcwidth==0.1.8 # via pytest
56-
werkzeug==1.0.1 # via -r requirements/_base.txt
59+
wcwidth==0.1.9 # via pytest
60+
werkzeug==1.0.1 # via -r _base.txt
5761
wrapt==1.11.2 # via astroid
58-
yarl==1.3.0 # via -r requirements/_base.txt, aiohttp
62+
yarl==1.4.2 # via -r _base.txt, aiohttp
63+
zipp==3.1.0 # via -r _base.txt, importlib-metadata
5964

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

0 commit comments

Comments
 (0)