Skip to content

Commit 3ab3bf6

Browse files
pcrespovpcrespov
authored
🏗️ Updates of testing, tooling and vulnerable libraries (ITISFoundation#2394)
- CHANGE: vulnerability upgrades of aiohttp and urllib3 (reported by dependabot) - CHANGE: upgrades all testing and tooling dependencies - FIX: missing dependencies in sidecar requirement files - CHANGE: scripts/codestyle.bash now installs all missing stub packages (e.g. types-PyYAML, types-aiofiles, etc)
1 parent 32f6501 commit 3ab3bf6

File tree

50 files changed

+886
-389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+886
-389
lines changed

‎api/tests/requirements.txt‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#
77
aiohttp==3.7.4.post0
88
# via
9+
# -c ../../requirements/constraints.txt
910
# -r requirements.in
1011
# pytest-aiohttp
1112
async-timeout==3.0.1
@@ -24,7 +25,7 @@ coverage==5.5
2425
# pytest-cov
2526
dictpath==0.1.3
2627
# via openapi-core
27-
idna==3.1
28+
idna==3.2
2829
# via yarl
2930
iniconfig==1.1.1
3031
# via pytest
@@ -38,13 +39,13 @@ jsonschema==3.2.0
3839
# openapi-spec-validator
3940
lazy-object-proxy==1.6.0
4041
# via openapi-core
41-
more-itertools==8.7.0
42+
more-itertools==8.8.0
4243
# via openapi-core
4344
multidict==5.1.0
4445
# via
4546
# aiohttp
4647
# yarl
47-
openapi-core==0.14.1
48+
openapi-core==0.14.2
4849
# via -r requirements.in
4950
openapi-schema-validator==0.1.5
5051
# via
@@ -68,7 +69,7 @@ pyrsistent==0.17.3
6869
# via jsonschema
6970
pytest-aiohttp==0.3.0
7071
# via -r requirements.in
71-
pytest-cov==2.11.1
72+
pytest-cov==2.12.1
7273
# via -r requirements.in
7374
pytest-instafail==0.4.2
7475
# via -r requirements.in
@@ -95,10 +96,12 @@ six==1.16.0
9596
termcolor==1.1.0
9697
# via pytest-sugar
9798
toml==0.10.2
98-
# via pytest
99+
# via
100+
# pytest
101+
# pytest-cov
99102
typing-extensions==3.10.0.0
100103
# via aiohttp
101-
werkzeug==2.0.0
104+
werkzeug==2.0.1
102105
# via openapi-core
103106
yarl==1.6.3
104107
# via aiohttp

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
dnspython==2.1.0
88
# via email-validator
9-
email-validator==1.1.2
9+
email-validator==1.1.3
1010
# via pydantic
1111
idna==2.10
1212
# via

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
# pip-compile --output-file=requirements/_test.txt requirements/_test.in
66
#
77
aiohttp==3.7.4.post0
8-
# via pytest-aiohttp
8+
# via
9+
# -c requirements/../../../requirements/constraints.txt
10+
# pytest-aiohttp
911
astroid==2.5.6
1012
# via pylint
1113
async-timeout==3.0.1
@@ -14,7 +16,7 @@ attrs==21.2.0
1416
# via
1517
# aiohttp
1618
# pytest
17-
certifi==2020.12.5
19+
certifi==2021.5.30
1820
# via requests
1921
chardet==4.0.0
2022
# via
@@ -25,7 +27,7 @@ coverage==5.5
2527
# -r requirements/_test.in
2628
# coveralls
2729
# pytest-cov
28-
coveralls==3.0.1
30+
coveralls==3.1.0
2931
# via -r requirements/_test.in
3032
docopt==0.6.2
3133
# via coveralls
@@ -38,7 +40,7 @@ idna==2.10
3840
# yarl
3941
iniconfig==1.1.1
4042
# via pytest
41-
isort==5.8.0
43+
isort==5.9.0
4244
# via pylint
4345
lazy-object-proxy==1.6.0
4446
# via astroid
@@ -61,21 +63,21 @@ pprintpp==0.4.0
6163
# via pytest-icdiff
6264
py==1.10.0
6365
# via pytest
64-
pylint==2.8.2
66+
pylint==2.8.3
6567
# via -r requirements/_test.in
6668
pyparsing==2.4.7
6769
# via packaging
6870
pytest-aiohttp==0.3.0
6971
# via -r requirements/_test.in
70-
pytest-cov==2.11.1
72+
pytest-cov==2.12.1
7173
# via -r requirements/_test.in
7274
pytest-icdiff==0.5
7375
# via -r requirements/_test.in
7476
pytest-instafail==0.4.2
7577
# via -r requirements/_test.in
7678
pytest-mock==3.6.1
7779
# via -r requirements/_test.in
78-
pytest-runner==5.3.0
80+
pytest-runner==5.3.1
7981
# via -r requirements/_test.in
8082
pytest-sugar==0.9.4
8183
# via -r requirements/_test.in
@@ -100,11 +102,12 @@ toml==0.10.2
100102
# via
101103
# pylint
102104
# pytest
105+
# pytest-cov
103106
typing-extensions==3.10.0.0
104107
# via
105108
# -c requirements/_base.txt
106109
# aiohttp
107-
urllib3==1.26.4
110+
urllib3==1.26.5
108111
# via
109112
# -c requirements/../../../requirements/constraints.txt
110113
# requests

‎packages/models-library/requirements/_tools.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ appdirs==1.4.4
88
# via
99
# black
1010
# virtualenv
11-
black==21.5b1
11+
black==21.6b0
1212
# via -r requirements/../../../requirements/devenv.txt
1313
bump2version==1.0.1
1414
# via -r requirements/../../../requirements/devenv.txt
15-
cfgv==3.2.0
15+
cfgv==3.3.0
1616
# via pre-commit
17-
click==8.0.0
17+
click==8.0.1
1818
# via
1919
# black
2020
# pip-tools
21-
distlib==0.3.1
21+
distlib==0.3.2
2222
# via virtualenv
2323
filelock==3.0.12
2424
# via virtualenv
25-
identify==2.2.4
25+
identify==2.2.10
2626
# via pre-commit
27-
isort==5.8.0
27+
isort==5.9.0
2828
# via
2929
# -c requirements/_test.txt
3030
# -r requirements/../../../requirements/devenv.txt
@@ -38,7 +38,7 @@ pep517==0.10.0
3838
# via pip-tools
3939
pip-tools==6.1.0
4040
# via -r requirements/../../../requirements/devenv.txt
41-
pre-commit==2.12.1
41+
pre-commit==2.13.0
4242
# via -r requirements/../../../requirements/devenv.txt
4343
pyyaml==5.4.1
4444
# via
@@ -55,7 +55,7 @@ toml==0.10.2
5555
# black
5656
# pep517
5757
# pre-commit
58-
virtualenv==20.4.6
58+
virtualenv==20.4.7
5959
# via pre-commit
6060

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

‎packages/postgres-database/requirements/_base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ idna==2.10
1010
# yarl
1111
multidict==5.1.0
1212
# via yarl
13-
psycopg2-binary==2.8.6
13+
psycopg2-binary==2.9.1
1414
# via sqlalchemy
1515
sqlalchemy[postgresql_psycopg2binary]==1.3.24
1616
# via

‎packages/postgres-database/requirements/_migration.in‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
-c ../../../requirements/constraints.txt
77
-c _base.txt
88

9+
# There are incompatible versions in the resolved dependencies:
10+
# websocket-client==1.1.0 (from -c requirements/_migration.txt (line 51))
11+
# websocket-client<1,>=0.32.0 (from docker-compose==1.29.1->-c requirements/../../../requirements/constraints.txt (line 25))
12+
websocket-client<1,>=0.32.0
13+
14+
# ----------------------
15+
16+
917
urllib3
1018

1119
alembic

‎packages/postgres-database/requirements/_migration.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
#
55
# pip-compile --output-file=requirements/_migration.txt requirements/_migration.in
66
#
7-
alembic==1.6.2
7+
alembic==1.6.5
88
# via -r requirements/_migration.in
9-
certifi==2020.12.5
9+
certifi==2021.5.30
1010
# via requests
1111
chardet==4.0.0
1212
# via requests
13-
click==8.0.0
13+
click==8.0.1
1414
# via -r requirements/_migration.in
1515
docker==5.0.0
1616
# via -r requirements/_migration.in
@@ -20,9 +20,9 @@ idna==2.10
2020
# requests
2121
mako==1.1.4
2222
# via alembic
23-
markupsafe==2.0.0
23+
markupsafe==2.0.1
2424
# via mako
25-
psycopg2-binary==2.8.6
25+
psycopg2-binary==2.9.1
2626
# via
2727
# -c requirements/_base.txt
2828
# sqlalchemy
@@ -44,10 +44,12 @@ sqlalchemy[postgresql_psycopg2binary]==1.3.24
4444
# alembic
4545
tenacity==7.0.0
4646
# via -r requirements/_migration.in
47-
urllib3==1.26.4
47+
urllib3==1.26.5
4848
# via
4949
# -c requirements/../../../requirements/constraints.txt
5050
# -r requirements/_migration.in
5151
# requests
5252
websocket-client==0.59.0
53-
# via docker
53+
# via
54+
# -r requirements/_migration.in
55+
# docker

‎packages/postgres-database/requirements/_test.txt‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
# pip-compile --output-file=requirements/_test.txt requirements/_test.in
66
#
77
aiohttp==3.7.4.post0
8-
# via pytest-aiohttp
8+
# via
9+
# -c requirements/../../../requirements/constraints.txt
10+
# pytest-aiohttp
911
aiopg[sa]==1.2.1
1012
# via -r requirements/_test.in
1113
astroid==2.5.6
@@ -14,15 +16,15 @@ async-timeout==3.0.1
1416
# via
1517
# aiohttp
1618
# aiopg
17-
attrs==20.3.0
19+
attrs==21.2.0
1820
# via
1921
# aiohttp
2022
# jsonschema
2123
# pytest
2224
# pytest-docker
2325
bcrypt==3.2.0
2426
# via paramiko
25-
certifi==2020.12.5
27+
certifi==2021.5.30
2628
# via
2729
# -c requirements/_migration.txt
2830
# requests
@@ -41,7 +43,7 @@ coverage==5.5
4143
# -r requirements/_test.in
4244
# coveralls
4345
# pytest-cov
44-
coveralls==3.0.1
46+
coveralls==3.1.0
4547
# via -r requirements/_test.in
4648
cryptography==3.4.7
4749
# via
@@ -63,7 +65,7 @@ docopt==0.6.2
6365
# via
6466
# coveralls
6567
# docker-compose
66-
faker==8.1.4
68+
faker==8.8.1
6769
# via -r requirements/_test.in
6870
idna==2.10
6971
# via
@@ -73,7 +75,7 @@ idna==2.10
7375
# yarl
7476
iniconfig==1.1.1
7577
# via pytest
76-
isort==5.8.0
78+
isort==5.9.0
7779
# via pylint
7880
jsonschema==3.2.0
7981
# via docker-compose
@@ -92,7 +94,7 @@ paramiko==2.7.2
9294
# via docker
9395
pluggy==0.13.1
9496
# via pytest
95-
psycopg2-binary==2.8.6
97+
psycopg2-binary==2.9.1
9698
# via
9799
# -c requirements/_base.txt
98100
# -c requirements/_migration.txt
@@ -102,7 +104,7 @@ py==1.10.0
102104
# via pytest
103105
pycparser==2.20
104106
# via cffi
105-
pylint==2.8.2
107+
pylint==2.8.3
106108
# via -r requirements/_test.in
107109
pynacl==1.4.0
108110
# via paramiko
@@ -112,13 +114,13 @@ pyrsistent==0.17.3
112114
# via jsonschema
113115
pytest-aiohttp==0.3.0
114116
# via -r requirements/_test.in
115-
pytest-cov==2.11.1
117+
pytest-cov==2.12.1
116118
# via -r requirements/_test.in
117-
pytest-docker==0.10.1
119+
pytest-docker==0.10.3
118120
# via -r requirements/_test.in
119121
pytest-instafail==0.4.2
120122
# via -r requirements/_test.in
121-
pytest-runner==5.3.0
123+
pytest-runner==5.3.1
122124
# via -r requirements/_test.in
123125
pytest==6.2.4
124126
# via
@@ -131,7 +133,7 @@ python-dateutil==2.8.1
131133
# via
132134
# -c requirements/_migration.txt
133135
# faker
134-
python-dotenv==0.17.1
136+
python-dotenv==0.18.0
135137
# via docker-compose
136138
pyyaml==5.4.1
137139
# via
@@ -167,9 +169,10 @@ toml==0.10.2
167169
# via
168170
# pylint
169171
# pytest
172+
# pytest-cov
170173
typing-extensions==3.10.0.0
171174
# via aiohttp
172-
urllib3==1.26.4
175+
urllib3==1.26.5
173176
# via
174177
# -c requirements/../../../requirements/constraints.txt
175178
# -c requirements/_migration.txt

0 commit comments

Comments
 (0)