Skip to content

Commit d9125d4

Browse files
pcrespovpcrespov
authored
🏗️ Upgrades testing and tooling requirements (#2291)
* 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
1 parent dfe92b5 commit d9125d4

File tree

47 files changed

+507
-346
lines changed

Some content is hidden

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

47 files changed

+507
-346
lines changed

‎api/tests/requirements.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --output-file=requirements.txt requirements.in
66
#
7-
aiohttp==3.7.4
7+
aiohttp==3.7.4.post0
88
# via
99
# -r requirements.in
1010
# pytest-aiohttp
@@ -16,19 +16,19 @@ attrs==20.3.0
1616
# jsonschema
1717
# openapi-core
1818
# pytest
19-
chardet==3.0.4
19+
chardet==4.0.0
2020
# via aiohttp
2121
coverage==5.5
2222
# via
2323
# -r requirements.in
2424
# pytest-cov
2525
idna-ssl==1.1.0
2626
# via aiohttp
27-
idna==2.10
27+
idna==3.1
2828
# via
2929
# idna-ssl
3030
# yarl
31-
importlib-metadata==3.7.0
31+
importlib-metadata==4.0.1
3232
# via
3333
# jsonschema
3434
# pluggy
@@ -43,7 +43,7 @@ jsonschema==3.2.0
4343
# via
4444
# openapi-schema-validator
4545
# openapi-spec-validator
46-
lazy-object-proxy==1.5.2
46+
lazy-object-proxy==1.6.0
4747
# via openapi-core
4848
more-itertools==8.7.0
4949
# via openapi-core
@@ -53,7 +53,7 @@ multidict==5.1.0
5353
# yarl
5454
openapi-core==0.13.7
5555
# via -r requirements.in
56-
openapi-schema-validator==0.1.4
56+
openapi-schema-validator==0.1.5
5757
# via
5858
# openapi-core
5959
# openapi-spec-validator
@@ -81,7 +81,7 @@ pytest-instafail==0.4.2
8181
# via -r requirements.in
8282
pytest-sugar==0.9.4
8383
# via -r requirements.in
84-
pytest==6.2.2
84+
pytest==6.2.3
8585
# via
8686
# -r requirements.in
8787
# pytest-aiohttp
@@ -112,7 +112,7 @@ werkzeug==1.0.1
112112
# via openapi-core
113113
yarl==1.6.3
114114
# via aiohttp
115-
zipp==3.4.0
115+
zipp==3.4.1
116116
# via importlib-metadata
117117

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

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,8 @@
44
-c ../../../requirements/constraints.txt
55

66
pydantic[email]
7+
8+
#There are incompatible versions in the resolved dependencies:
9+
# idna==3.1 (from -c requirements/_base.txt (line 13))
10+
# idna<3,>=2.5 (from requests==2.25.1->coveralls==3.0.1->-r requirements/_test.in (line 24))
11+
idna<3,>=2.5

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ dnspython==2.1.0
1111
email-validator==1.1.2
1212
# via pydantic
1313
idna==2.10
14-
# via email-validator
14+
# via
15+
# -r requirements/_base.in
16+
# email-validator
1517
pydantic[email]==1.8.1
1618
# via -r requirements/_base.in
1719
typing-extensions==3.7.4.3

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
# pip-compile --output-file=requirements/_test.txt requirements/_test.in
66
#
7-
aiohttp==3.7.4
7+
aiohttp==3.7.4.post0
88
# via pytest-aiohttp
9-
astroid==2.5.1
9+
astroid==2.5.3
1010
# via pylint
1111
async-timeout==3.0.1
1212
# via aiohttp
@@ -16,7 +16,7 @@ attrs==20.3.0
1616
# pytest
1717
certifi==2020.12.5
1818
# via requests
19-
chardet==3.0.4
19+
chardet==4.0.0
2020
# via
2121
# aiohttp
2222
# requests
@@ -39,18 +39,18 @@ idna==2.10
3939
# idna-ssl
4040
# requests
4141
# yarl
42-
importlib-metadata==3.7.0
42+
importlib-metadata==4.0.1
4343
# via
4444
# pint
4545
# pluggy
4646
# pytest
47-
importlib-resources==5.1.1
47+
importlib-resources==5.1.2
4848
# via pint
4949
iniconfig==1.1.1
5050
# via pytest
51-
isort==5.7.0
51+
isort==5.8.0
5252
# via pylint
53-
lazy-object-proxy==1.5.2
53+
lazy-object-proxy==1.6.0
5454
# via astroid
5555
mccabe==0.6.1
5656
# via pylint
@@ -63,15 +63,15 @@ packaging==20.9
6363
# pint
6464
# pytest
6565
# pytest-sugar
66-
pint==0.16.1
66+
pint==0.17
6767
# via -r requirements/_test.in
6868
pluggy==0.13.1
6969
# via pytest
7070
pprintpp==0.4.0
7171
# via pytest-icdiff
7272
py==1.10.0
7373
# via pytest
74-
pylint==2.7.2
74+
pylint==2.7.4
7575
# via -r requirements/_test.in
7676
pyparsing==2.4.7
7777
# via packaging
@@ -89,7 +89,7 @@ pytest-runner==5.3.0
8989
# via -r requirements/_test.in
9090
pytest-sugar==0.9.4
9191
# via -r requirements/_test.in
92-
pytest==6.2.2
92+
pytest==6.2.3
9393
# via
9494
# -r requirements/_test.in
9595
# pytest-aiohttp
@@ -110,23 +110,23 @@ toml==0.10.2
110110
# via
111111
# pylint
112112
# pytest
113-
typed-ast==1.4.2
113+
typed-ast==1.4.3
114114
# via astroid
115115
typing-extensions==3.7.4.3
116116
# via
117117
# -c requirements/_base.txt
118118
# aiohttp
119119
# importlib-metadata
120120
# yarl
121-
urllib3==1.26.3
121+
urllib3==1.26.4
122122
# via
123123
# -c requirements/../../../requirements/constraints.txt
124124
# requests
125125
wrapt==1.12.1
126126
# via astroid
127127
yarl==1.6.3
128128
# via aiohttp
129-
zipp==3.4.0
129+
zipp==3.4.1
130130
# via
131131
# importlib-metadata
132132
# importlib-resources

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

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,47 +26,51 @@ distlib==0.3.1
2626
# via virtualenv
2727
filelock==3.0.12
2828
# via virtualenv
29-
identify==2.1.0
29+
identify==2.2.4
3030
# via pre-commit
31-
importlib-metadata==3.7.0
31+
importlib-metadata==4.0.1
3232
# via
3333
# -c requirements/_test.txt
34+
# pep517
3435
# pre-commit
3536
# virtualenv
36-
importlib-resources==5.1.1
37+
importlib-resources==5.1.2
3738
# via
3839
# -c requirements/_test.txt
3940
# pre-commit
4041
# virtualenv
41-
isort==5.7.0
42+
isort==5.8.0
4243
# via
4344
# -c requirements/_test.txt
4445
# -r requirements/../../../requirements/devenv.txt
4546
mypy-extensions==0.4.3
4647
# via black
47-
nodeenv==1.5.0
48+
nodeenv==1.6.0
4849
# via pre-commit
4950
pathspec==0.8.1
5051
# via black
51-
pip-tools==5.5.0
52+
pep517==0.10.0
53+
# via pip-tools
54+
pip-tools==6.1.0
5255
# via -r requirements/../../../requirements/devenv.txt
53-
pre-commit==2.10.1
56+
pre-commit==2.12.1
5457
# via -r requirements/../../../requirements/devenv.txt
5558
pyyaml==5.4.1
5659
# via
5760
# -c requirements/../../../requirements/constraints.txt
5861
# -c requirements/_test.txt
5962
# pre-commit
60-
regex==2020.11.13
63+
regex==2021.4.4
6164
# via black
6265
six==1.15.0
6366
# via virtualenv
6467
toml==0.10.2
6568
# via
6669
# -c requirements/_test.txt
6770
# black
71+
# pep517
6872
# pre-commit
69-
typed-ast==1.4.2
73+
typed-ast==1.4.3
7074
# via
7175
# -c requirements/_test.txt
7276
# black
@@ -76,13 +80,14 @@ typing-extensions==3.7.4.3
7680
# -c requirements/_test.txt
7781
# black
7882
# importlib-metadata
79-
virtualenv==20.4.2
83+
virtualenv==20.4.4
8084
# via pre-commit
81-
zipp==3.4.0
85+
zipp==3.4.1
8286
# via
8387
# -c requirements/_test.txt
8488
# importlib-metadata
8589
# importlib-resources
90+
# pep517
8691

8792
# The following packages are considered to be unsafe in a requirements file:
8893
# pip

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,12 @@
33
#
44
-c ../../../requirements/constraints.txt
55

6-
sqlalchemy[postgresql_psycopg2binary]
6+
# sqlalchemy[postgresql_psycopg2binary]<1.4,>=1.1 (from aiopg[sa]==1.2.1->-r requirements/_test.in (line 14))
7+
sqlalchemy[postgresql_psycopg2binary]<1.4,>=1.1
8+
79
yarl
10+
11+
# There are incompatible versions in the resolved dependencies:
12+
# idna==3.1 (from -c requirements/_base.txt (line 9))
13+
# idna<3,>=2.5 (from requests==2.25.1->docker==5.0.0->-r requirements/_migration.in (line 16))
14+
idna<3,>=2.5

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
# pip-compile --output-file=requirements/_base.txt requirements/_base.in
66
#
77
idna==2.10
8-
# via yarl
8+
# via
9+
# -r requirements/_base.in
10+
# yarl
911
multidict==5.1.0
1012
# via yarl
1113
psycopg2-binary==2.8.6
1214
# via sqlalchemy
13-
sqlalchemy[postgresql_psycopg2binary]==1.3.23
15+
sqlalchemy[postgresql_psycopg2binary]==1.3.24
1416
# via
1517
# -c requirements/../../../requirements/constraints.txt
1618
# -r requirements/_base.in

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#
55
# pip-compile --output-file=requirements/_migration.txt requirements/_migration.in
66
#
7-
alembic==1.5.5
7+
alembic==1.5.8
88
# via -r requirements/_migration.in
99
certifi==2020.12.5
1010
# via requests
11-
chardet==3.0.4
11+
chardet==4.0.0
1212
# via requests
1313
click==7.1.2
1414
# via -r requirements/_migration.in
@@ -17,6 +17,7 @@ docker==5.0.0
1717
idna==2.10
1818
# via
1919
# -c requirements/_base.txt
20+
# -r requirements/_migration.in
2021
# requests
2122
mako==1.1.4
2223
# via alembic
@@ -37,14 +38,14 @@ six==1.15.0
3738
# python-dateutil
3839
# tenacity
3940
# websocket-client
40-
sqlalchemy[postgresql_psycopg2binary]==1.3.23
41+
sqlalchemy[postgresql_psycopg2binary]==1.3.24
4142
# via
4243
# -c requirements/../../../requirements/constraints.txt
4344
# -c requirements/_base.txt
4445
# alembic
4546
tenacity==7.0.0
4647
# via -r requirements/_migration.in
47-
urllib3==1.26.3
48+
urllib3==1.26.4
4849
# via
4950
# -c requirements/../../../requirements/constraints.txt
5051
# -r requirements/_migration.in

0 commit comments

Comments
 (0)