Skip to content

Commit 9ec9d21

Browse files
authored
Maintenance/upgrades test tools (#1628)
* updates testing libs * Updated packages test reqs (not base.in reqs) * Updates web-server test reqs * Updates storage test reqs * Upgrades api-server tests reqs * Upgrades catalog tests reqs * Updates director test reqs * Updates sidecar tests reqs * Moved templates under .vscode with extension
1 parent 8da6422 commit 9ec9d21

File tree

16 files changed

+109
-143
lines changed

16 files changed

+109
-143
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ ENV/
110110
node_modules/
111111

112112
# IDEs config
113-
.vscode/
113+
.vscode/launch.json
114+
.vscode/settings.json
114115

115116
# Manual overrides
116117
services/docker-compose.override.yml

.vscode-template/README.md

-42
This file was deleted.
File renamed without changes.
File renamed without changes.

api/tests/requirements.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ aiohttp==3.6.2 # via -r requirements.in, pytest-aiohttp
88
async-timeout==3.0.1 # via aiohttp
99
attrs==19.3.0 # via aiohttp, jsonschema, openapi-core, pytest
1010
chardet==3.0.4 # via aiohttp
11-
coverage==5.1 # via -r requirements.in, pytest-cov
11+
coverage==5.2 # via -r requirements.in, pytest-cov
1212
idna-ssl==1.1.0 # via aiohttp
13-
idna==2.9 # via idna-ssl, yarl
14-
importlib-metadata==1.6.1 # via jsonschema, pluggy, pytest
13+
idna==2.10 # via idna-ssl, yarl
14+
importlib-metadata==1.7.0 # via jsonschema, pluggy, pytest
1515
isodate==0.6.0 # via openapi-schema-validator
1616
jsonschema==3.2.0 # via openapi-schema-validator, openapi-spec-validator
1717
lazy-object-proxy==1.5.0 # via openapi-core
@@ -23,20 +23,20 @@ openapi-spec-validator==0.2.8 # via openapi-core
2323
packaging==20.4 # via pytest, pytest-sugar
2424
parse==1.15.0 # via openapi-core
2525
pluggy==0.13.1 # via pytest
26-
py==1.8.2 # via pytest
26+
py==1.9.0 # via pytest
2727
pyparsing==2.4.7 # via packaging
2828
pyrsistent==0.16.0 # via jsonschema
2929
pytest-aiohttp==0.3.0 # via -r requirements.in
3030
pytest-cov==2.10.0 # via -r requirements.in
3131
pytest-instafail==0.4.2 # via -r requirements.in
32-
pytest-sugar==0.9.3 # via -r requirements.in
32+
pytest-sugar==0.9.4 # via -r requirements.in
3333
pytest==5.4.3 # via -r requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-sugar
3434
pyyaml==5.3.1 # via openapi-spec-validator
3535
six==1.15.0 # via isodate, jsonschema, openapi-core, openapi-schema-validator, openapi-spec-validator, packaging
3636
strict-rfc3339==0.7 # via openapi-schema-validator
3737
termcolor==1.1.0 # via pytest-sugar
3838
typing-extensions==3.7.4.2 # via aiohttp
39-
wcwidth==0.2.4 # via pytest
39+
wcwidth==0.2.5 # via pytest
4040
werkzeug==1.0.1 # via openapi-core
4141
yarl==1.4.2 # via aiohttp
4242
zipp==3.1.0 # via importlib-metadata

packages/postgres-database/requirements/_test.txt

+9-4
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ attrs==19.3.0 # via aiohttp, pytest, pytest-docker
1313
certifi==2020.6.20 # via -r requirements/_migration.txt, requests
1414
chardet==3.0.4 # via -r requirements/_migration.txt, aiohttp, requests
1515
click==7.1.2 # via -r requirements/_migration.txt
16-
coverage==5.1 # via -r requirements/_test.in, coveralls, pytest-cov
17-
coveralls==2.0.0 # via -r requirements/_test.in
16+
coverage==5.2 # via -r requirements/_test.in, coveralls, pytest-cov
17+
coveralls==2.1.1 # via -r requirements/_test.in
1818
docker==4.2.2 # via -r requirements/_migration.txt
1919
docopt==0.6.2 # via coveralls
2020
faker==4.1.1 # via -r requirements/_test.in
21+
idna-ssl==1.1.0 # via aiohttp
2122
idna==2.9 # via -r requirements/_migration.txt, requests, yarl
23+
importlib-metadata==1.7.0 # via pluggy, pytest
2224
isort==4.3.21 # via pylint
2325
lazy-object-proxy==1.4.3 # via astroid
2426
mako==1.1.3 # via -r requirements/_migration.txt, alembic
@@ -29,7 +31,7 @@ multidict==4.7.6 # via -r requirements/_migration.txt, aiohttp, yarl
2931
packaging==20.4 # via pytest
3032
pluggy==0.13.1 # via pytest
3133
psycopg2-binary==2.8.5 # via -r requirements/_migration.txt, aiopg, sqlalchemy
32-
py==1.8.2 # via pytest
34+
py==1.9.0 # via pytest
3335
pylint==2.5.3 # via -r requirements/_test.in
3436
pyparsing==2.4.7 # via packaging
3537
pytest-aiohttp==0.3.0 # via -r requirements/_test.in
@@ -47,8 +49,11 @@ sqlalchemy[postgresql_psycopg2binary]==1.3.17 # via -r requirements/_migration.
4749
tenacity==6.2.0 # via -r requirements/_migration.txt
4850
text-unidecode==1.3 # via faker
4951
toml==0.10.1 # via pylint
52+
typed-ast==1.4.1 # via astroid
53+
typing-extensions==3.7.4.2 # via aiohttp
5054
urllib3==1.25.9 # via -r requirements/_migration.txt, requests
51-
wcwidth==0.2.4 # via pytest
55+
wcwidth==0.2.5 # via pytest
5256
websocket-client==0.57.0 # via -r requirements/_migration.txt, docker
5357
wrapt==1.12.1 # via astroid
5458
yarl==1.4.2 # via -r requirements/_migration.txt, aiohttp
59+
zipp==3.1.0 # via importlib-metadata

packages/s3wrapper/requirements/_test.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ attrs==19.3.0 # via pytest, pytest-docker
99
certifi==2020.6.20 # via -r requirements/_base.txt, minio, requests
1010
chardet==3.0.4 # via requests
1111
configparser==5.0.0 # via -r requirements/_base.txt, minio
12-
coverage==5.1 # via -r requirements/_test.in, coveralls, pytest-cov
13-
coveralls==2.0.0 # via -r requirements/_test.in
12+
coverage==5.2 # via -r requirements/_test.in, coveralls, pytest-cov
13+
coveralls==2.1.1 # via -r requirements/_test.in
1414
docopt==0.6.2 # via coveralls
15-
idna==2.9 # via requests
16-
importlib-metadata==1.6.1 # via pluggy, pytest
15+
idna==2.10 # via requests
16+
importlib-metadata==1.7.0 # via pluggy, pytest
1717
isort==4.3.21 # via pylint
1818
lazy-object-proxy==1.4.3 # via astroid
1919
mccabe==0.6.1 # via pylint
2020
minio==5.0.10 # via -r requirements/_base.txt
2121
more-itertools==8.4.0 # via pytest
2222
packaging==20.4 # via pytest
2323
pluggy==0.13.1 # via pytest
24-
py==1.8.2 # via pytest
24+
py==1.9.0 # via pytest
2525
pylint==2.5.3 # via -r requirements/_test.in
2626
pyparsing==2.4.7 # via packaging
2727
pytest-cov==2.10.0 # via -r requirements/_test.in
@@ -35,6 +35,6 @@ six==1.15.0 # via -r requirements/_base.txt, astroid, packaging, p
3535
toml==0.10.1 # via pylint
3636
typed-ast==1.4.1 # via astroid
3737
urllib3==1.25.9 # via -r requirements/_base.txt, minio, requests
38-
wcwidth==0.2.4 # via pytest
38+
wcwidth==0.2.5 # via pytest
3939
wrapt==1.12.1 # via astroid
4040
zipp==3.1.0 # via importlib-metadata

packages/service-library/requirements/_test.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ async-timeout==3.0.1 # via -r requirements/_base.txt, aiohttp
1313
attrs==19.3.0 # via -r requirements/_base.txt, aiohttp, jsonschema, openapi-core, pytest, pytest-docker
1414
certifi==2020.6.20 # via requests
1515
chardet==3.0.4 # via -r requirements/_base.txt, aiohttp, requests
16-
coverage==5.1 # via -r requirements/_test.in, coveralls, pytest-cov
17-
coveralls==2.0.0 # via -r requirements/_test.in
16+
coverage==5.2 # via -r requirements/_test.in, coveralls, pytest-cov
17+
coveralls==2.1.1 # via -r requirements/_test.in
1818
docopt==0.6.2 # via coveralls
1919
idna-ssl==1.1.0 # via -r requirements/_base.txt, aiohttp
2020
idna==2.9 # via -r requirements/_base.txt, idna-ssl, requests, yarl
@@ -32,17 +32,17 @@ packaging==20.4 # via pytest, pytest-sugar
3232
pluggy==0.13.1 # via pytest
3333
prometheus-client==0.8.0 # via -r requirements/_base.txt
3434
psycopg2-binary==2.8.5 # via -r requirements/_base.txt, aiopg, sqlalchemy
35-
py==1.8.2 # via pytest
35+
py==1.9.0 # via pytest
3636
pylint==2.5.3 # via -r requirements/_test.in
3737
pyparsing==2.4.7 # via packaging
3838
pyrsistent==0.16.0 # via -r requirements/_base.txt, jsonschema
3939
pytest-aiohttp==0.3.0 # via -r requirements/_test.in
4040
pytest-cov==2.10.0 # via -r requirements/_test.in
4141
pytest-docker==0.7.2 # via -r requirements/_test.in
4242
pytest-instafail==0.4.2 # via -r requirements/_test.in
43-
pytest-mock==3.1.1 # via -r requirements/_test.in
43+
pytest-mock==3.2.0 # via -r requirements/_test.in
4444
pytest-runner==5.2 # via -r requirements/_test.in
45-
pytest-sugar==0.9.3 # via -r requirements/_test.in
45+
pytest-sugar==0.9.4 # via -r requirements/_test.in
4646
pytest==5.4.3 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
4747
pyyaml==5.3.1 # via -r requirements/_base.txt, openapi-spec-validator
4848
requests==2.24.0 # via coveralls
@@ -57,7 +57,7 @@ typed-ast==1.4.1 # via astroid
5757
typing-extensions==3.7.4.2 # via -r requirements/_base.txt, aiohttp
5858
ujson==3.0.0 # via -r requirements/_base.txt
5959
urllib3==1.25.9 # via requests
60-
wcwidth==0.2.4 # via pytest
60+
wcwidth==0.2.5 # via pytest
6161
werkzeug==1.0.1 # via -r requirements/_base.txt
6262
wrapt==1.12.1 # via astroid
6363
yarl==1.4.2 # via -r requirements/_base.txt, aiohttp

packages/simcore-sdk/requirements/_test.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ async-timeout==3.0.1 # via -r requirements/_base.txt, aiohttp
1212
attrs==19.3.0 # via -r requirements/_base.txt, aiohttp, pytest, pytest-docker
1313
certifi==2020.6.20 # via requests
1414
chardet==3.0.4 # via -r requirements/_base.txt, aiohttp, requests
15-
coverage==5.1 # via -r requirements/_test.in, coveralls, pytest-cov
16-
coveralls==2.0.0 # via -r requirements/_test.in
15+
coverage==5.2 # via -r requirements/_test.in, coveralls, pytest-cov
16+
coveralls==2.1.1 # via -r requirements/_test.in
1717
dataclasses==0.7 # via -r requirements/_base.txt, pydantic
1818
decorator==4.4.2 # via -r requirements/_base.txt, networkx
19-
docker==4.2.1 # via -r requirements/_test.in
19+
docker==4.2.2 # via -r requirements/_test.in
2020
docopt==0.6.2 # via coveralls
2121
idna-ssl==1.1.0 # via -r requirements/_base.txt, aiohttp
2222
idna==2.9 # via -r requirements/_base.txt, idna-ssl, requests, yarl
23-
importlib-metadata==1.6.1 # via pluggy, pytest
23+
importlib-metadata==1.7.0 # via pluggy, pytest
2424
isort==4.3.21 # via pylint
2525
lazy-object-proxy==1.4.3 # via astroid
2626
mccabe==0.6.1 # via pylint
@@ -31,17 +31,17 @@ networkx==2.4 # via -r requirements/_base.txt
3131
packaging==20.4 # via pytest, pytest-sugar
3232
pluggy==0.13.1 # via pytest
3333
psycopg2-binary==2.8.5 # via -r requirements/_base.txt, aiopg, sqlalchemy
34-
py==1.8.2 # via pytest
34+
py==1.9.0 # via pytest
3535
pydantic==1.5.1 # via -r requirements/_base.txt
3636
pylint==2.5.3 # via -r requirements/_test.in
3737
pyparsing==2.4.7 # via packaging
3838
pytest-aiohttp==0.3.0 # via -r requirements/_test.in
3939
pytest-cov==2.10.0 # via -r requirements/_test.in
4040
pytest-docker==0.7.2 # via -r requirements/_test.in
4141
pytest-instafail==0.4.2 # via -r requirements/_test.in
42-
pytest-mock==3.1.1 # via -r requirements/_test.in
42+
pytest-mock==3.2.0 # via -r requirements/_test.in
4343
pytest-runner==5.2 # via -r requirements/_test.in
44-
pytest-sugar==0.9.3 # via -r requirements/_test.in
44+
pytest-sugar==0.9.4 # via -r requirements/_test.in
4545
pytest==5.4.3 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
4646
pyyaml==5.3.1 # via -r requirements/_base.txt, trafaret-config
4747
requests==2.24.0 # via -r requirements/_test.in, coveralls, docker
@@ -55,7 +55,7 @@ trafaret==2.0.2 # via -r requirements/_base.txt, trafaret-config
5555
typed-ast==1.4.1 # via astroid
5656
typing-extensions==3.7.4.2 # via -r requirements/_base.txt, aiohttp
5757
urllib3==1.25.9 # via requests
58-
wcwidth==0.2.4 # via pytest
58+
wcwidth==0.2.5 # via pytest
5959
websocket-client==0.57.0 # via docker
6060
wrapt==1.12.1 # via astroid
6161
yarl==1.4.2 # via -r requirements/_base.txt, aiohttp

services/api-server/requirements/_test.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ chardet==3.0.4 # via -r requirements/_base.txt, aiohttp, httpx, reque
2323
click==7.1.2 # via -r requirements/_base.txt, uvicorn
2424
codecov==2.1.7 # via -r requirements/_test.in
2525
contextvars==2.4 # via -r requirements/_base.txt, sniffio
26-
coverage==5.1 # via codecov, coveralls, pytest-cov
27-
coveralls==2.0.0 # via -r requirements/_test.in
26+
coverage==5.2 # via codecov, coveralls, pytest-cov
27+
coveralls==2.1.1 # via -r requirements/_test.in
2828
cryptography==2.9.2 # via -r requirements/_base.txt
2929
dataclasses==0.7 # via -r requirements/_base.txt, pydantic
3030
dnspython==1.16.0 # via -r requirements/_base.txt, email-validator
31-
docker==4.2.1 # via -r requirements/_test.in
31+
docker==4.2.2 # via -r requirements/_test.in
3232
docopt==0.6.2 # via coveralls
3333
email-validator==1.1.1 # via -r requirements/_base.txt, fastapi
3434
faker==4.1.1 # via -r requirements/_test.in
@@ -47,7 +47,7 @@ hyperframe==5.2.0 # via -r requirements/_base.txt, h2
4747
idna-ssl==1.1.0 # via aiohttp
4848
idna==2.9 # via -r requirements/_base.txt, email-validator, httpx, requests, yarl
4949
immutables==0.14 # via -r requirements/_base.txt, contextvars
50-
importlib-metadata==1.6.1 # via pluggy, pytest
50+
importlib-metadata==1.7.0 # via pluggy, pytest
5151
isort==4.3.21 # via pylint
5252
itsdangerous==1.1.0 # via -r requirements/_base.txt, fastapi
5353
jinja2==2.11.2 # via -r requirements/_base.txt, -r requirements/_test.in, fastapi
@@ -64,15 +64,15 @@ pluggy==0.13.1 # via pytest
6464
promise==2.3 # via -r requirements/_base.txt, graphql-core, graphql-relay
6565
psycopg2-binary==2.8.5 # via -r requirements/_base.txt, aiopg, sqlalchemy
6666
ptvsd==4.3.2 # via -r requirements/_test.in
67-
py==1.8.2 # via pytest
67+
py==1.9.0 # via pytest
6868
pycparser==2.20 # via -r requirements/_base.txt, cffi
6969
pydantic[dotenv]==1.5.1 # via -r requirements/_base.txt, fastapi
7070
pylint==2.5.3 # via -r requirements/_test.in
7171
pyparsing==2.4.7 # via packaging
7272
pytest-aiohttp==0.3.0 # via -r requirements/_test.in
7373
pytest-cov==2.10.0 # via -r requirements/_test.in
7474
pytest-docker==0.7.2 # via -r requirements/_test.in
75-
pytest-mock==3.1.1 # via -r requirements/_test.in
75+
pytest-mock==3.2.0 # via -r requirements/_test.in
7676
pytest-runner==5.2 # via -r requirements/_test.in
7777
pytest==5.4.3 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-mock
7878
python-dateutil==2.8.1 # via alembic, faker

services/catalog/requirements/_test.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ certifi==2020.6.20 # via -r requirements/_base.txt, requests
1818
chardet==3.0.4 # via -r requirements/_base.txt, aiohttp, requests
1919
click==7.1.2 # via -r requirements/_base.txt, uvicorn
2020
codecov==2.1.7 # via -r requirements/_test.in
21-
coverage==5.1 # via codecov, coveralls, pytest-cov
22-
coveralls==2.0.0 # via -r requirements/_test.in
21+
coverage==5.2 # via codecov, coveralls, pytest-cov
22+
coveralls==2.1.1 # via -r requirements/_test.in
2323
dataclasses==0.7 # via -r requirements/_base.txt, pydantic
2424
dnspython==1.16.0 # via -r requirements/_base.txt, email-validator
25-
docker==4.2.1 # via -r requirements/_test.in
25+
docker==4.2.2 # via -r requirements/_test.in
2626
docopt==0.6.2 # via coveralls
2727
email-validator==1.1.1 # via -r requirements/_base.txt, fastapi
2828
faker==4.1.1 # via -r requirements/_test.in
@@ -34,7 +34,7 @@ h11==0.9.0 # via -r requirements/_base.txt, uvicorn
3434
httptools==0.1.1 # via -r requirements/_base.txt, uvicorn
3535
idna-ssl==1.1.0 # via aiohttp
3636
idna==2.9 # via -r requirements/_base.txt, email-validator, requests, yarl
37-
importlib-metadata==1.6.1 # via pluggy, pytest
37+
importlib-metadata==1.7.0 # via pluggy, pytest
3838
isort==4.3.21 # via pylint
3939
itsdangerous==1.1.0 # via -r requirements/_base.txt, fastapi
4040
jinja2==2.11.2 # via -r requirements/_base.txt, fastapi
@@ -57,7 +57,7 @@ pyparsing==2.4.7 # via packaging
5757
pytest-aiohttp==0.3.0 # via -r requirements/_test.in
5858
pytest-cov==2.10.0 # via -r requirements/_test.in
5959
pytest-docker==0.7.2 # via -r requirements/_test.in
60-
pytest-mock==3.1.1 # via -r requirements/_test.in
60+
pytest-mock==3.2.0 # via -r requirements/_test.in
6161
pytest-runner==5.2 # via -r requirements/_test.in
6262
pytest==5.4.3 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-mock
6363
python-dateutil==2.8.1 # via alembic, faker

0 commit comments

Comments
 (0)