Skip to content

Commit 2eafd34

Browse files
authored
Maintenance/weekly upgrades (#1841)
* weekly requirement upgrades for packages: - yarl PR#1836 - pytest PR #1835 - pytest-docker PR #1834 : removes constraints on attrs. Both upgraded in all services as well! - docker-compose to 1.27.4 * Now pip-compile is done from a docker container instead of the developer host. Added draft of dev-container and used to pip-compile reqs:
1 parent 587a3e8 commit 2eafd34

File tree

30 files changed

+170
-117
lines changed

30 files changed

+170
-117
lines changed

.dockerignore

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# root
2-
.*/
32
ancillary/
43
docs/
54
ops/
65

7-
# Docker
8-
**/Dockerfile
9-
**/docker-compose*
10-
116
# Byte-compiled / optimized / DLL files
127
**/__pycache__
138
*.py[cod]
9+
10+
# virtualenv
11+
.venv

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,4 @@ prof/
158158
services/**/.codeclimate.yml
159159
# WSL
160160
.fake_hostname_file
161+
.bash_history

ci/github/helpers/setup_docker_compose.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ set -o pipefail # don't hide errors within pipes
66
IFS=$'\n\t'
77

88
# when changing the DOCKER_COMPOSE_VERSION please compute the sha256sum on an ubuntu box (macOS has different checksum)
9-
DOCKER_COMPOSE_VERSION="1.27.3"
10-
DOCKER_COMPOSE_SHA256SUM="92055c48e1514c0377b76ed3df87f505c50099145d86835b06fa5109811b6a83"
9+
DOCKER_COMPOSE_VERSION="1.27.4"
10+
DOCKER_COMPOSE_SHA256SUM="04216d65ce0cd3c27223eab035abfeb20a8bef20259398e3b9d9aa8de633286d"
1111
DOCKER_COMPOSE_BIN=/usr/local/bin/docker-compose
1212
curl -L "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o $DOCKER_COMPOSE_BIN
1313
chmod +x $DOCKER_COMPOSE_BIN

packages/postgres-database/requirements/_base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ multidict==4.7.6 # via yarl
99
psycopg2-binary==2.8.6 # via sqlalchemy
1010
sqlalchemy[postgresql_psycopg2binary]==1.3.19 # via -r requirements/_base.in
1111
typing-extensions==3.7.4.3 # via yarl
12-
yarl==1.5.1 # via -r requirements/_base.in
12+
yarl==1.6.0 # via -r requirements/_base.in

packages/postgres-database/requirements/_migration.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ tenacity==6.2.0 # via -r requirements/_migration.in
2323
typing-extensions==3.7.4.3 # via -r requirements/_base.txt, yarl
2424
urllib3==1.25.10 # via -r requirements/_migration.in, requests
2525
websocket-client==0.57.0 # via docker
26-
yarl==1.5.1 # via -r requirements/_base.txt
26+
yarl==1.6.0 # via -r requirements/_base.txt

packages/postgres-database/requirements/_test.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,32 @@ aiopg[sa]==1.0.0 # via -r requirements/_test.in
99
alembic==1.4.3 # via -r requirements/_migration.txt
1010
astroid==2.4.2 # via pylint
1111
async-timeout==3.0.1 # via aiohttp
12-
attrs==19.3.0 # via aiohttp, jsonschema, pytest, pytest-docker
12+
attrs==20.2.0 # via aiohttp, jsonschema, pytest, pytest-docker
1313
bcrypt==3.2.0 # via paramiko
14-
cached-property==1.5.1 # via docker-compose
14+
cached-property==1.5.2 # via docker-compose
1515
certifi==2020.6.20 # via -r requirements/_migration.txt, requests
1616
cffi==1.14.3 # via bcrypt, cryptography, pynacl
1717
chardet==3.0.4 # via -r requirements/_migration.txt, aiohttp, requests
1818
click==7.1.2 # via -r requirements/_migration.txt
1919
coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov
2020
coveralls==2.1.2 # via -r requirements/_test.in
21-
cryptography==3.1 # via paramiko
21+
cryptography==3.1.1 # via paramiko
2222
distro==1.5.0 # via docker-compose
23-
docker-compose==1.27.3 # via pytest-docker
23+
docker-compose==1.27.4 # via pytest-docker
2424
docker[ssh]==4.3.1 # via -r requirements/_migration.txt, docker-compose
2525
dockerpty==0.4.1 # via docker-compose
2626
docopt==0.6.2 # via coveralls, docker-compose
2727
faker==4.1.3 # via -r requirements/_test.in
2828
idna-ssl==1.1.0 # via aiohttp
2929
idna==2.10 # via -r requirements/_migration.txt, idna-ssl, requests, yarl
30-
importlib-metadata==1.7.0 # via jsonschema, pluggy, pytest
30+
importlib-metadata==2.0.0 # via jsonschema, pluggy, pytest
3131
iniconfig==1.0.1 # via pytest
3232
isort==5.5.3 # via pylint
3333
jsonschema==3.2.0 # via docker-compose
3434
lazy-object-proxy==1.4.3 # via astroid
3535
mako==1.1.3 # via -r requirements/_migration.txt, alembic
3636
markupsafe==1.1.1 # via -r requirements/_migration.txt, mako
3737
mccabe==0.6.1 # via pylint
38-
more-itertools==8.5.0 # via pytest
3938
multidict==4.7.6 # via -r requirements/_migration.txt, aiohttp, yarl
4039
packaging==20.4 # via pytest
4140
paramiko==2.7.2 # via docker
@@ -49,10 +48,10 @@ pyparsing==2.4.7 # via packaging
4948
pyrsistent==0.17.3 # via jsonschema
5049
pytest-aiohttp==0.3.0 # via -r requirements/_test.in
5150
pytest-cov==2.10.1 # via -r requirements/_test.in
52-
pytest-docker==0.10.0 # via -r requirements/_test.in
51+
pytest-docker==0.10.1 # via -r requirements/_test.in
5352
pytest-instafail==0.4.2 # via -r requirements/_test.in
5453
pytest-runner==5.2 # via -r requirements/_test.in
55-
pytest==6.0.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-instafail
54+
pytest==6.1.0 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-instafail
5655
python-dateutil==2.8.1 # via -r requirements/_migration.txt, alembic, faker
5756
python-dotenv==0.14.0 # via docker-compose
5857
python-editor==1.0.4 # via -r requirements/_migration.txt, alembic
@@ -69,8 +68,8 @@ typing-extensions==3.7.4.3 # via -r requirements/_migration.txt, aiohttp, yarl
6968
urllib3==1.25.10 # via -r requirements/_migration.txt, requests
7069
websocket-client==0.57.0 # via -r requirements/_migration.txt, docker, docker-compose
7170
wrapt==1.12.1 # via astroid
72-
yarl==1.5.1 # via -r requirements/_migration.txt, aiohttp
73-
zipp==3.1.0 # via importlib-metadata
71+
yarl==1.6.0 # via -r requirements/_migration.txt, aiohttp
72+
zipp==3.2.0 # via importlib-metadata
7473

7574
# The following packages are considered to be unsafe in a requirements file:
7675
# setuptools

packages/s3wrapper/requirements/_test.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,29 @@
55
# pip-compile --output-file=requirements/_test.txt requirements/_test.in
66
#
77
astroid==2.4.2 # via pylint
8-
attrs==19.3.0 # via jsonschema, pytest, pytest-docker
8+
attrs==20.2.0 # via jsonschema, pytest, pytest-docker
99
bcrypt==3.2.0 # via paramiko
10-
cached-property==1.5.1 # via docker-compose
10+
cached-property==1.5.2 # via docker-compose
1111
certifi==2020.6.20 # via -r requirements/_base.txt, minio, requests
1212
cffi==1.14.3 # via bcrypt, cryptography, pynacl
1313
chardet==3.0.4 # via requests
1414
configparser==5.0.0 # via -r requirements/_base.txt, minio
1515
coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov
1616
coveralls==2.1.2 # via -r requirements/_test.in
17-
cryptography==3.1 # via paramiko
17+
cryptography==3.1.1 # via paramiko
1818
distro==1.5.0 # via docker-compose
19-
docker-compose==1.27.3 # via pytest-docker
19+
docker-compose==1.27.4 # via pytest-docker
2020
docker[ssh]==4.3.1 # via docker-compose
2121
dockerpty==0.4.1 # via docker-compose
2222
docopt==0.6.2 # via coveralls, docker-compose
2323
idna==2.10 # via requests
24-
importlib-metadata==1.7.0 # via jsonschema, pluggy, pytest
24+
importlib-metadata==2.0.0 # via jsonschema, pluggy, pytest
2525
iniconfig==1.0.1 # via pytest
2626
isort==5.5.3 # via pylint
2727
jsonschema==3.2.0 # via docker-compose
2828
lazy-object-proxy==1.4.3 # via astroid
2929
mccabe==0.6.1 # via pylint
3030
minio==6.0.0 # via -r requirements/_base.txt
31-
more-itertools==8.5.0 # via pytest
3231
packaging==20.4 # via pytest
3332
paramiko==2.7.2 # via docker
3433
pluggy==0.13.1 # via pytest
@@ -39,9 +38,9 @@ pynacl==1.4.0 # via paramiko
3938
pyparsing==2.4.7 # via packaging
4039
pyrsistent==0.17.3 # via jsonschema
4140
pytest-cov==2.10.1 # via -r requirements/_test.in
42-
pytest-docker==0.10.0 # via -r requirements/_test.in
41+
pytest-docker==0.10.1 # via -r requirements/_test.in
4342
pytest-runner==5.2 # via -r requirements/_test.in
44-
pytest==6.0.2 # via -r requirements/_test.in, pytest-cov, pytest-docker
43+
pytest==6.1.0 # via -r requirements/_test.in, pytest-cov, pytest-docker
4544
python-dateutil==2.8.1 # via -r requirements/_base.txt, minio
4645
python-dotenv==0.14.0 # via docker-compose
4746
pytz==2020.1 # via -r requirements/_base.txt, minio
@@ -54,7 +53,7 @@ typed-ast==1.4.1 # via astroid
5453
urllib3==1.25.10 # via -r requirements/_base.txt, minio, requests
5554
websocket-client==0.57.0 # via docker, docker-compose
5655
wrapt==1.12.1 # via astroid
57-
zipp==3.1.0 # via importlib-metadata
56+
zipp==3.2.0 # via importlib-metadata
5857

5958
# The following packages are considered to be unsafe in a requirements file:
6059
# setuptools

packages/service-library/requirements/_base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ werkzeug
1616
jsonschema
1717
prometheus_client
1818
tenacity
19-
attrs<20,>=19 # from pytest-docker==0.8.0
19+
attrs
2020
trafaret
2121
aiodebug

packages/service-library/requirements/_base.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ aiohttp==3.6.2 # via -r requirements/_base.in, aiozipkin
99
aiopg[sa]==1.0.0 # via -r requirements/_base.in
1010
aiozipkin==0.7.1 # via -r requirements/_base.in
1111
async-timeout==3.0.1 # via aiohttp
12-
attrs==19.3.0 # via -r requirements/_base.in, aiohttp, jsonschema, openapi-core
12+
attrs==20.2.0 # via -r requirements/_base.in, aiohttp, jsonschema, openapi-core
1313
chardet==3.0.4 # via aiohttp
14-
idna==2.10 # via yarl
14+
idna-ssl==1.1.0 # via aiohttp
15+
idna==2.10 # via idna-ssl, yarl
16+
importlib-metadata==2.0.0 # via jsonschema
1517
isodate==0.6.0 # via openapi-core
1618
jsonschema==3.2.0 # via -r requirements/_base.in, openapi-spec-validator
1719
lazy-object-proxy==1.4.3 # via -r requirements/_base.in, openapi-core
@@ -30,7 +32,8 @@ trafaret==2.1.0 # via -r requirements/_base.in
3032
typing-extensions==3.7.4.3 # via aiohttp, yarl
3133
ujson==3.2.0 # via -r requirements/_base.in
3234
werkzeug==1.0.1 # via -r requirements/_base.in
33-
yarl==1.5.1 # via aiohttp
35+
yarl==1.6.0 # via aiohttp
36+
zipp==3.2.0 # via importlib-metadata
3437

3538
# The following packages are considered to be unsafe in a requirements file:
3639
# setuptools

packages/service-library/requirements/_test.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,29 @@ aiopg[sa]==1.0.0 # via -r requirements/_base.txt
1010
aiozipkin==0.7.1 # via -r requirements/_base.txt
1111
astroid==2.4.2 # via pylint
1212
async-timeout==3.0.1 # via -r requirements/_base.txt, aiohttp
13-
attrs==19.3.0 # via -r requirements/_base.txt, aiohttp, jsonschema, openapi-core, pytest, pytest-docker
13+
attrs==20.2.0 # via -r requirements/_base.txt, aiohttp, jsonschema, openapi-core, pytest, pytest-docker
1414
bcrypt==3.2.0 # via paramiko
15-
cached-property==1.5.1 # via docker-compose
15+
cached-property==1.5.2 # via docker-compose
1616
certifi==2020.6.20 # via requests
1717
cffi==1.14.3 # via bcrypt, cryptography, pynacl
1818
chardet==3.0.4 # via -r requirements/_base.txt, aiohttp, requests
1919
coverage==5.3 # via -r requirements/_test.in, coveralls, pytest-cov
2020
coveralls==2.1.2 # via -r requirements/_test.in
21-
cryptography==3.1 # via paramiko
21+
cryptography==3.1.1 # via paramiko
2222
distro==1.5.0 # via docker-compose
23-
docker-compose==1.27.3 # via pytest-docker
23+
docker-compose==1.27.4 # via pytest-docker
2424
docker[ssh]==4.3.1 # via docker-compose
2525
dockerpty==0.4.1 # via docker-compose
2626
docopt==0.6.2 # via coveralls, docker-compose
2727
idna-ssl==1.1.0 # via -r requirements/_base.txt, aiohttp
2828
idna==2.10 # via -r requirements/_base.txt, idna-ssl, requests, yarl
29-
importlib-metadata==1.7.0 # via -r requirements/_base.txt, jsonschema, pluggy, pytest
29+
importlib-metadata==2.0.0 # via -r requirements/_base.txt, jsonschema, pluggy, pytest
3030
iniconfig==1.0.1 # via pytest
3131
isodate==0.6.0 # via -r requirements/_base.txt, openapi-core
3232
isort==5.5.3 # via pylint
3333
jsonschema==3.2.0 # via -r requirements/_base.txt, docker-compose, openapi-spec-validator
3434
lazy-object-proxy==1.4.3 # via -r requirements/_base.txt, astroid, openapi-core
3535
mccabe==0.6.1 # via pylint
36-
more-itertools==8.5.0 # via pytest
3736
multidict==4.7.6 # via -r requirements/_base.txt, aiohttp, yarl
3837
openapi-core==0.12.0 # via -r requirements/_base.txt
3938
openapi-spec-validator==0.2.9 # via -r requirements/_base.txt, openapi-core
@@ -50,12 +49,12 @@ pyparsing==2.4.7 # via packaging
5049
pyrsistent==0.17.3 # via -r requirements/_base.txt, jsonschema
5150
pytest-aiohttp==0.3.0 # via -r requirements/_test.in
5251
pytest-cov==2.10.1 # via -r requirements/_test.in
53-
pytest-docker==0.10.0 # via -r requirements/_test.in
52+
pytest-docker==0.10.1 # via -r requirements/_test.in
5453
pytest-instafail==0.4.2 # via -r requirements/_test.in
5554
pytest-mock==3.3.1 # via -r requirements/_test.in
5655
pytest-runner==5.2 # via -r requirements/_test.in
5756
pytest-sugar==0.9.4 # via -r requirements/_test.in
58-
pytest==6.0.2 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-instafail, pytest-mock, pytest-sugar
57+
pytest==6.1.0 # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-docker, pytest-instafail, pytest-mock, pytest-sugar
5958
python-dotenv==0.14.0 # via docker-compose
6059
pyyaml==5.3.1 # via -r requirements/_base.txt, docker-compose, openapi-spec-validator
6160
requests==2.24.0 # via coveralls, docker, docker-compose
@@ -74,7 +73,8 @@ urllib3==1.25.10 # via requests
7473
websocket-client==0.57.0 # via docker, docker-compose
7574
werkzeug==1.0.1 # via -r requirements/_base.txt
7675
wrapt==1.12.1 # via astroid
77-
yarl==1.5.1 # via -r requirements/_base.txt, aiohttp
76+
yarl==1.6.0 # via -r requirements/_base.txt, aiohttp
77+
zipp==3.2.0 # via -r requirements/_base.txt, importlib-metadata
7878

7979
# The following packages are considered to be unsafe in a requirements file:
8080
# setuptools

0 commit comments

Comments
 (0)