Skip to content

Commit

Permalink
🏗️ Upgrades testing and tooling requirements (#2291)
Browse files Browse the repository at this point in the history
* upgrades pytest==6.2.3 in the entire repo

* new CONSTRAINT aiopg[sa]==1.2.1 is limiting [sqlalchemy[postgresql_psycopg2binary]<1.4,>=1.1 which now  released 1.4.11. Leads to sqlalchemy[postgresql_psycopg2binary] between 1.3.19 - 1.3.24 in the repo.

* new CONSTRAINT idna<3,>=2.5 by requests==2.25.1->coveralls==3.0.1 -> idna==2.10 in the entire repo
  • Loading branch information
pcrespov authored Apr 24, 2021
1 parent dfe92b5 commit d9125d4
Show file tree
Hide file tree
Showing 47 changed files with 507 additions and 346 deletions.
16 changes: 8 additions & 8 deletions api/tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --output-file=requirements.txt requirements.in
#
aiohttp==3.7.4
aiohttp==3.7.4.post0
# via
# -r requirements.in
# pytest-aiohttp
Expand All @@ -16,19 +16,19 @@ attrs==20.3.0
# jsonschema
# openapi-core
# pytest
chardet==3.0.4
chardet==4.0.0
# via aiohttp
coverage==5.5
# via
# -r requirements.in
# pytest-cov
idna-ssl==1.1.0
# via aiohttp
idna==2.10
idna==3.1
# via
# idna-ssl
# yarl
importlib-metadata==3.7.0
importlib-metadata==4.0.1
# via
# jsonschema
# pluggy
Expand All @@ -43,7 +43,7 @@ jsonschema==3.2.0
# via
# openapi-schema-validator
# openapi-spec-validator
lazy-object-proxy==1.5.2
lazy-object-proxy==1.6.0
# via openapi-core
more-itertools==8.7.0
# via openapi-core
Expand All @@ -53,7 +53,7 @@ multidict==5.1.0
# yarl
openapi-core==0.13.7
# via -r requirements.in
openapi-schema-validator==0.1.4
openapi-schema-validator==0.1.5
# via
# openapi-core
# openapi-spec-validator
Expand Down Expand Up @@ -81,7 +81,7 @@ pytest-instafail==0.4.2
# via -r requirements.in
pytest-sugar==0.9.4
# via -r requirements.in
pytest==6.2.2
pytest==6.2.3
# via
# -r requirements.in
# pytest-aiohttp
Expand Down Expand Up @@ -112,7 +112,7 @@ werkzeug==1.0.1
# via openapi-core
yarl==1.6.3
# via aiohttp
zipp==3.4.0
zipp==3.4.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
5 changes: 5 additions & 0 deletions packages/models-library/requirements/_base.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,8 @@
-c ../../../requirements/constraints.txt

pydantic[email]

#There are incompatible versions in the resolved dependencies:
# idna==3.1 (from -c requirements/_base.txt (line 13))
# idna<3,>=2.5 (from requests==2.25.1->coveralls==3.0.1->-r requirements/_test.in (line 24))
idna<3,>=2.5
4 changes: 3 additions & 1 deletion packages/models-library/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ dnspython==2.1.0
email-validator==1.1.2
# via pydantic
idna==2.10
# via email-validator
# via
# -r requirements/_base.in
# email-validator
pydantic[email]==1.8.1
# via -r requirements/_base.in
typing-extensions==3.7.4.3
Expand Down
26 changes: 13 additions & 13 deletions packages/models-library/requirements/_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# pip-compile --output-file=requirements/_test.txt requirements/_test.in
#
aiohttp==3.7.4
aiohttp==3.7.4.post0
# via pytest-aiohttp
astroid==2.5.1
astroid==2.5.3
# via pylint
async-timeout==3.0.1
# via aiohttp
Expand All @@ -16,7 +16,7 @@ attrs==20.3.0
# pytest
certifi==2020.12.5
# via requests
chardet==3.0.4
chardet==4.0.0
# via
# aiohttp
# requests
Expand All @@ -39,18 +39,18 @@ idna==2.10
# idna-ssl
# requests
# yarl
importlib-metadata==3.7.0
importlib-metadata==4.0.1
# via
# pint
# pluggy
# pytest
importlib-resources==5.1.1
importlib-resources==5.1.2
# via pint
iniconfig==1.1.1
# via pytest
isort==5.7.0
isort==5.8.0
# via pylint
lazy-object-proxy==1.5.2
lazy-object-proxy==1.6.0
# via astroid
mccabe==0.6.1
# via pylint
Expand All @@ -63,15 +63,15 @@ packaging==20.9
# pint
# pytest
# pytest-sugar
pint==0.16.1
pint==0.17
# via -r requirements/_test.in
pluggy==0.13.1
# via pytest
pprintpp==0.4.0
# via pytest-icdiff
py==1.10.0
# via pytest
pylint==2.7.2
pylint==2.7.4
# via -r requirements/_test.in
pyparsing==2.4.7
# via packaging
Expand All @@ -89,7 +89,7 @@ pytest-runner==5.3.0
# via -r requirements/_test.in
pytest-sugar==0.9.4
# via -r requirements/_test.in
pytest==6.2.2
pytest==6.2.3
# via
# -r requirements/_test.in
# pytest-aiohttp
Expand All @@ -110,23 +110,23 @@ toml==0.10.2
# via
# pylint
# pytest
typed-ast==1.4.2
typed-ast==1.4.3
# via astroid
typing-extensions==3.7.4.3
# via
# -c requirements/_base.txt
# aiohttp
# importlib-metadata
# yarl
urllib3==1.26.3
urllib3==1.26.4
# via
# -c requirements/../../../requirements/constraints.txt
# requests
wrapt==1.12.1
# via astroid
yarl==1.6.3
# via aiohttp
zipp==3.4.0
zipp==3.4.1
# via
# importlib-metadata
# importlib-resources
27 changes: 16 additions & 11 deletions packages/models-library/requirements/_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,47 +26,51 @@ distlib==0.3.1
# via virtualenv
filelock==3.0.12
# via virtualenv
identify==2.1.0
identify==2.2.4
# via pre-commit
importlib-metadata==3.7.0
importlib-metadata==4.0.1
# via
# -c requirements/_test.txt
# pep517
# pre-commit
# virtualenv
importlib-resources==5.1.1
importlib-resources==5.1.2
# via
# -c requirements/_test.txt
# pre-commit
# virtualenv
isort==5.7.0
isort==5.8.0
# via
# -c requirements/_test.txt
# -r requirements/../../../requirements/devenv.txt
mypy-extensions==0.4.3
# via black
nodeenv==1.5.0
nodeenv==1.6.0
# via pre-commit
pathspec==0.8.1
# via black
pip-tools==5.5.0
pep517==0.10.0
# via pip-tools
pip-tools==6.1.0
# via -r requirements/../../../requirements/devenv.txt
pre-commit==2.10.1
pre-commit==2.12.1
# via -r requirements/../../../requirements/devenv.txt
pyyaml==5.4.1
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_test.txt
# pre-commit
regex==2020.11.13
regex==2021.4.4
# via black
six==1.15.0
# via virtualenv
toml==0.10.2
# via
# -c requirements/_test.txt
# black
# pep517
# pre-commit
typed-ast==1.4.2
typed-ast==1.4.3
# via
# -c requirements/_test.txt
# black
Expand All @@ -76,13 +80,14 @@ typing-extensions==3.7.4.3
# -c requirements/_test.txt
# black
# importlib-metadata
virtualenv==20.4.2
virtualenv==20.4.4
# via pre-commit
zipp==3.4.0
zipp==3.4.1
# via
# -c requirements/_test.txt
# importlib-metadata
# importlib-resources
# pep517

# The following packages are considered to be unsafe in a requirements file:
# pip
9 changes: 8 additions & 1 deletion packages/postgres-database/requirements/_base.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,12 @@
#
-c ../../../requirements/constraints.txt

sqlalchemy[postgresql_psycopg2binary]
# sqlalchemy[postgresql_psycopg2binary]<1.4,>=1.1 (from aiopg[sa]==1.2.1->-r requirements/_test.in (line 14))
sqlalchemy[postgresql_psycopg2binary]<1.4,>=1.1

yarl

# There are incompatible versions in the resolved dependencies:
# idna==3.1 (from -c requirements/_base.txt (line 9))
# idna<3,>=2.5 (from requests==2.25.1->docker==5.0.0->-r requirements/_migration.in (line 16))
idna<3,>=2.5
6 changes: 4 additions & 2 deletions packages/postgres-database/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
# pip-compile --output-file=requirements/_base.txt requirements/_base.in
#
idna==2.10
# via yarl
# via
# -r requirements/_base.in
# yarl
multidict==5.1.0
# via yarl
psycopg2-binary==2.8.6
# via sqlalchemy
sqlalchemy[postgresql_psycopg2binary]==1.3.23
sqlalchemy[postgresql_psycopg2binary]==1.3.24
# via
# -c requirements/../../../requirements/constraints.txt
# -r requirements/_base.in
Expand Down
9 changes: 5 additions & 4 deletions packages/postgres-database/requirements/_migration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# pip-compile --output-file=requirements/_migration.txt requirements/_migration.in
#
alembic==1.5.5
alembic==1.5.8
# via -r requirements/_migration.in
certifi==2020.12.5
# via requests
chardet==3.0.4
chardet==4.0.0
# via requests
click==7.1.2
# via -r requirements/_migration.in
Expand All @@ -17,6 +17,7 @@ docker==5.0.0
idna==2.10
# via
# -c requirements/_base.txt
# -r requirements/_migration.in
# requests
mako==1.1.4
# via alembic
Expand All @@ -37,14 +38,14 @@ six==1.15.0
# python-dateutil
# tenacity
# websocket-client
sqlalchemy[postgresql_psycopg2binary]==1.3.23
sqlalchemy[postgresql_psycopg2binary]==1.3.24
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# alembic
tenacity==7.0.0
# via -r requirements/_migration.in
urllib3==1.26.3
urllib3==1.26.4
# via
# -c requirements/../../../requirements/constraints.txt
# -r requirements/_migration.in
Expand Down
Loading

0 comments on commit d9125d4

Please sign in to comment.