Skip to content

Commit

Permalink
🏗️ Updates of testing, tooling and vulnerable libraries (#2394)
Browse files Browse the repository at this point in the history
- 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)
  • Loading branch information
pcrespov authored Jun 21, 2021
1 parent 32f6501 commit 3ab3bf6
Show file tree
Hide file tree
Showing 50 changed files with 886 additions and 389 deletions.
15 changes: 9 additions & 6 deletions api/tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#
aiohttp==3.7.4.post0
# via
# -c ../../requirements/constraints.txt
# -r requirements.in
# pytest-aiohttp
async-timeout==3.0.1
Expand All @@ -24,7 +25,7 @@ coverage==5.5
# pytest-cov
dictpath==0.1.3
# via openapi-core
idna==3.1
idna==3.2
# via yarl
iniconfig==1.1.1
# via pytest
Expand All @@ -38,13 +39,13 @@ jsonschema==3.2.0
# openapi-spec-validator
lazy-object-proxy==1.6.0
# via openapi-core
more-itertools==8.7.0
more-itertools==8.8.0
# via openapi-core
multidict==5.1.0
# via
# aiohttp
# yarl
openapi-core==0.14.1
openapi-core==0.14.2
# via -r requirements.in
openapi-schema-validator==0.1.5
# via
Expand All @@ -68,7 +69,7 @@ pyrsistent==0.17.3
# via jsonschema
pytest-aiohttp==0.3.0
# via -r requirements.in
pytest-cov==2.11.1
pytest-cov==2.12.1
# via -r requirements.in
pytest-instafail==0.4.2
# via -r requirements.in
Expand All @@ -95,10 +96,12 @@ six==1.16.0
termcolor==1.1.0
# via pytest-sugar
toml==0.10.2
# via pytest
# via
# pytest
# pytest-cov
typing-extensions==3.10.0.0
# via aiohttp
werkzeug==2.0.0
werkzeug==2.0.1
# via openapi-core
yarl==1.6.3
# via aiohttp
Expand Down
2 changes: 1 addition & 1 deletion packages/models-library/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
dnspython==2.1.0
# via email-validator
email-validator==1.1.2
email-validator==1.1.3
# via pydantic
idna==2.10
# via
Expand Down
19 changes: 11 additions & 8 deletions packages/models-library/requirements/_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
# pip-compile --output-file=requirements/_test.txt requirements/_test.in
#
aiohttp==3.7.4.post0
# via pytest-aiohttp
# via
# -c requirements/../../../requirements/constraints.txt
# pytest-aiohttp
astroid==2.5.6
# via pylint
async-timeout==3.0.1
Expand All @@ -14,7 +16,7 @@ attrs==21.2.0
# via
# aiohttp
# pytest
certifi==2020.12.5
certifi==2021.5.30
# via requests
chardet==4.0.0
# via
Expand All @@ -25,7 +27,7 @@ coverage==5.5
# -r requirements/_test.in
# coveralls
# pytest-cov
coveralls==3.0.1
coveralls==3.1.0
# via -r requirements/_test.in
docopt==0.6.2
# via coveralls
Expand All @@ -38,7 +40,7 @@ idna==2.10
# yarl
iniconfig==1.1.1
# via pytest
isort==5.8.0
isort==5.9.0
# via pylint
lazy-object-proxy==1.6.0
# via astroid
Expand All @@ -61,21 +63,21 @@ pprintpp==0.4.0
# via pytest-icdiff
py==1.10.0
# via pytest
pylint==2.8.2
pylint==2.8.3
# via -r requirements/_test.in
pyparsing==2.4.7
# via packaging
pytest-aiohttp==0.3.0
# via -r requirements/_test.in
pytest-cov==2.11.1
pytest-cov==2.12.1
# via -r requirements/_test.in
pytest-icdiff==0.5
# via -r requirements/_test.in
pytest-instafail==0.4.2
# via -r requirements/_test.in
pytest-mock==3.6.1
# via -r requirements/_test.in
pytest-runner==5.3.0
pytest-runner==5.3.1
# via -r requirements/_test.in
pytest-sugar==0.9.4
# via -r requirements/_test.in
Expand All @@ -100,11 +102,12 @@ toml==0.10.2
# via
# pylint
# pytest
# pytest-cov
typing-extensions==3.10.0.0
# via
# -c requirements/_base.txt
# aiohttp
urllib3==1.26.4
urllib3==1.26.5
# via
# -c requirements/../../../requirements/constraints.txt
# requests
Expand Down
16 changes: 8 additions & 8 deletions packages/models-library/requirements/_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ appdirs==1.4.4
# via
# black
# virtualenv
black==21.5b1
black==21.6b0
# via -r requirements/../../../requirements/devenv.txt
bump2version==1.0.1
# via -r requirements/../../../requirements/devenv.txt
cfgv==3.2.0
cfgv==3.3.0
# via pre-commit
click==8.0.0
click==8.0.1
# via
# black
# pip-tools
distlib==0.3.1
distlib==0.3.2
# via virtualenv
filelock==3.0.12
# via virtualenv
identify==2.2.4
identify==2.2.10
# via pre-commit
isort==5.8.0
isort==5.9.0
# via
# -c requirements/_test.txt
# -r requirements/../../../requirements/devenv.txt
Expand All @@ -38,7 +38,7 @@ pep517==0.10.0
# via pip-tools
pip-tools==6.1.0
# via -r requirements/../../../requirements/devenv.txt
pre-commit==2.12.1
pre-commit==2.13.0
# via -r requirements/../../../requirements/devenv.txt
pyyaml==5.4.1
# via
Expand All @@ -55,7 +55,7 @@ toml==0.10.2
# black
# pep517
# pre-commit
virtualenv==20.4.6
virtualenv==20.4.7
# via pre-commit

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion packages/postgres-database/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ idna==2.10
# yarl
multidict==5.1.0
# via yarl
psycopg2-binary==2.8.6
psycopg2-binary==2.9.1
# via sqlalchemy
sqlalchemy[postgresql_psycopg2binary]==1.3.24
# via
Expand Down
8 changes: 8 additions & 0 deletions packages/postgres-database/requirements/_migration.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
-c ../../../requirements/constraints.txt
-c _base.txt

# There are incompatible versions in the resolved dependencies:
# websocket-client==1.1.0 (from -c requirements/_migration.txt (line 51))
# websocket-client<1,>=0.32.0 (from docker-compose==1.29.1->-c requirements/../../../requirements/constraints.txt (line 25))
websocket-client<1,>=0.32.0

# ----------------------


urllib3

alembic
Expand Down
16 changes: 9 additions & 7 deletions packages/postgres-database/requirements/_migration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# pip-compile --output-file=requirements/_migration.txt requirements/_migration.in
#
alembic==1.6.2
alembic==1.6.5
# via -r requirements/_migration.in
certifi==2020.12.5
certifi==2021.5.30
# via requests
chardet==4.0.0
# via requests
click==8.0.0
click==8.0.1
# via -r requirements/_migration.in
docker==5.0.0
# via -r requirements/_migration.in
Expand All @@ -20,9 +20,9 @@ idna==2.10
# requests
mako==1.1.4
# via alembic
markupsafe==2.0.0
markupsafe==2.0.1
# via mako
psycopg2-binary==2.8.6
psycopg2-binary==2.9.1
# via
# -c requirements/_base.txt
# sqlalchemy
Expand All @@ -44,10 +44,12 @@ sqlalchemy[postgresql_psycopg2binary]==1.3.24
# alembic
tenacity==7.0.0
# via -r requirements/_migration.in
urllib3==1.26.4
urllib3==1.26.5
# via
# -c requirements/../../../requirements/constraints.txt
# -r requirements/_migration.in
# requests
websocket-client==0.59.0
# via docker
# via
# -r requirements/_migration.in
# docker
29 changes: 16 additions & 13 deletions packages/postgres-database/requirements/_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
# pip-compile --output-file=requirements/_test.txt requirements/_test.in
#
aiohttp==3.7.4.post0
# via pytest-aiohttp
# via
# -c requirements/../../../requirements/constraints.txt
# pytest-aiohttp
aiopg[sa]==1.2.1
# via -r requirements/_test.in
astroid==2.5.6
Expand All @@ -14,15 +16,15 @@ async-timeout==3.0.1
# via
# aiohttp
# aiopg
attrs==20.3.0
attrs==21.2.0
# via
# aiohttp
# jsonschema
# pytest
# pytest-docker
bcrypt==3.2.0
# via paramiko
certifi==2020.12.5
certifi==2021.5.30
# via
# -c requirements/_migration.txt
# requests
Expand All @@ -41,7 +43,7 @@ coverage==5.5
# -r requirements/_test.in
# coveralls
# pytest-cov
coveralls==3.0.1
coveralls==3.1.0
# via -r requirements/_test.in
cryptography==3.4.7
# via
Expand All @@ -63,7 +65,7 @@ docopt==0.6.2
# via
# coveralls
# docker-compose
faker==8.1.4
faker==8.8.1
# via -r requirements/_test.in
idna==2.10
# via
Expand All @@ -73,7 +75,7 @@ idna==2.10
# yarl
iniconfig==1.1.1
# via pytest
isort==5.8.0
isort==5.9.0
# via pylint
jsonschema==3.2.0
# via docker-compose
Expand All @@ -92,7 +94,7 @@ paramiko==2.7.2
# via docker
pluggy==0.13.1
# via pytest
psycopg2-binary==2.8.6
psycopg2-binary==2.9.1
# via
# -c requirements/_base.txt
# -c requirements/_migration.txt
Expand All @@ -102,7 +104,7 @@ py==1.10.0
# via pytest
pycparser==2.20
# via cffi
pylint==2.8.2
pylint==2.8.3
# via -r requirements/_test.in
pynacl==1.4.0
# via paramiko
Expand All @@ -112,13 +114,13 @@ pyrsistent==0.17.3
# via jsonschema
pytest-aiohttp==0.3.0
# via -r requirements/_test.in
pytest-cov==2.11.1
pytest-cov==2.12.1
# via -r requirements/_test.in
pytest-docker==0.10.1
pytest-docker==0.10.3
# via -r requirements/_test.in
pytest-instafail==0.4.2
# via -r requirements/_test.in
pytest-runner==5.3.0
pytest-runner==5.3.1
# via -r requirements/_test.in
pytest==6.2.4
# via
Expand All @@ -131,7 +133,7 @@ python-dateutil==2.8.1
# via
# -c requirements/_migration.txt
# faker
python-dotenv==0.17.1
python-dotenv==0.18.0
# via docker-compose
pyyaml==5.4.1
# via
Expand Down Expand Up @@ -167,9 +169,10 @@ toml==0.10.2
# via
# pylint
# pytest
# pytest-cov
typing-extensions==3.10.0.0
# via aiohttp
urllib3==1.26.4
urllib3==1.26.5
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_migration.txt
Expand Down
Loading

0 comments on commit 3ab3bf6

Please sign in to comment.