Skip to content

[maintenance] requirements upgrades #1502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 14, 2020
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion api/tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@

ROOT_DIR = $(abspath $(CURDIR)/../../)
VENV_DIR ?= $(abspath $(ROOT_DIR)/.venv)
UPGRADE_OPTION := $(if $(upgrade),--upgrade-package $(upgrade),--upgrade)


.PHONY: all
all: install tests

.PHONY: reqs
requirements.txt: requirements.in
# pip compiling $<
@$(VENV_DIR)/bin/pip-compile --output-file $@ $<
@$(VENV_DIR)/bin/pip-compile $(UPGRADE_OPTION) --build-isolation --output-file $@ $<

reqs: requirements.txt ## alias to compile requirements.txt

Expand Down
6 changes: 2 additions & 4 deletions api/tests/requirements.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@

# testing
coverage==4.5.1 # TODO: Downgraded because of a bug https://github.com/nedbat/coveragepy/issues/716

pytest~=5.3.5 # Bug in pytest-sugar https://github.com/Teemu/pytest-sugar/issues/187
coverage
pytest
pytest-cov
pytest-aiohttp
pytest-instafail
pytest-sugar


# fixtures
aiohttp
openapi-core
20 changes: 10 additions & 10 deletions api/tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ aiohttp==3.6.2 # via -r requirements.in, pytest-aiohttp
async-timeout==3.0.1 # via aiohttp
attrs==19.3.0 # via aiohttp, jsonschema, openapi-core, pytest
chardet==3.0.4 # via aiohttp
coverage==4.5.1 # via -r requirements.in, pytest-cov
coverage==5.1 # via -r requirements.in, pytest-cov
idna-ssl==1.1.0 # via aiohttp
idna==2.9 # via idna-ssl, yarl
importlib-metadata==1.5.0 # via jsonschema, pluggy, pytest
importlib-metadata==1.6.0 # via jsonschema, pluggy, pytest
isodate==0.6.0 # via openapi-schema-validator
jsonschema==3.2.0 # via openapi-schema-validator, openapi-spec-validator
lazy-object-proxy==1.4.3 # via openapi-core
Expand All @@ -24,20 +24,20 @@ packaging==20.3 # via pytest, pytest-sugar
parse==1.15.0 # via openapi-core
pluggy==0.13.1 # via pytest
py==1.8.1 # via pytest
pyparsing==2.4.6 # via packaging
pyrsistent==0.15.7 # via jsonschema
pyparsing==2.4.7 # via packaging
pyrsistent==0.16.0 # via jsonschema
pytest-aiohttp==0.3.0 # via -r requirements.in
pytest-cov==2.8.1 # via -r requirements.in
pytest-instafail==0.4.1.post0 # via -r requirements.in
pytest-sugar==0.9.2 # via -r requirements.in
pytest==5.3.5 # via -r requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-sugar
pyyaml==5.3 # via openapi-spec-validator
pytest-sugar==0.9.3 # via -r requirements.in
pytest==5.4.2 # via -r requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-sugar
pyyaml==5.3.1 # via openapi-spec-validator
six==1.14.0 # via isodate, jsonschema, openapi-core, openapi-schema-validator, openapi-spec-validator, packaging
strict-rfc3339==0.7 # via openapi-schema-validator
termcolor==1.1.0 # via pytest-sugar
typing-extensions==3.7.4.1 # via aiohttp
wcwidth==0.1.8 # via pytest
werkzeug==1.0.0 # via openapi-core
typing-extensions==3.7.4.2 # via aiohttp
wcwidth==0.1.9 # via pytest
werkzeug==1.0.1 # via openapi-core
yarl==1.4.2 # via aiohttp
zipp==3.1.0 # via importlib-metadata

Expand Down
1 change: 0 additions & 1 deletion packages/postgres-database/requirements/_migration.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# frozen specs
-r _base.txt

certifi==2019.11.28 # added contraint to fit pre-installation of jupyter/base-notebook:python-3.7.3 (cannot uninstall)
urllib3>=1.25.8 # Vulnerability

alembic
Expand Down
2 changes: 1 addition & 1 deletion packages/postgres-database/requirements/_migration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# pip-compile --output-file=requirements/_migration.txt requirements/_migration.in
#
alembic==1.4.2 # via -r requirements/_migration.in
certifi==2019.11.28 # via -r requirements/_migration.in, requests
certifi==2020.4.5.1 # via requests
chardet==3.0.4 # via requests
click==7.1.2 # via -r requirements/_migration.in
docker==4.2.0 # via -r requirements/_migration.in
Expand Down
4 changes: 2 additions & 2 deletions packages/postgres-database/requirements/_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ alembic==1.4.2 # via -r requirements/_migration.txt
astroid==2.4.1 # via pylint
async-timeout==3.0.1 # via aiohttp
attrs==19.3.0 # via aiohttp, pytest, pytest-docker
certifi==2019.11.28 # via -r requirements/_migration.txt, requests
certifi==2020.4.5.1 # via -r requirements/_migration.txt, requests
chardet==3.0.4 # via -r requirements/_migration.txt, aiohttp, requests
click==7.1.2 # via -r requirements/_migration.txt
coverage==5.1 # via -r requirements/_test.in, coveralls, pytest-cov
coveralls==2.0.0 # via -r requirements/_test.in
docker==4.2.0 # via -r requirements/_migration.txt
docopt==0.6.2 # via coveralls
faker==4.0.3 # via -r requirements/_test.in
faker==4.1.0 # via -r requirements/_test.in
idna-ssl==1.1.0 # via aiohttp
idna==2.9 # via -r requirements/_migration.txt, requests, yarl
importlib-metadata==1.6.0 # via pluggy, pytest
Expand Down
2 changes: 1 addition & 1 deletion services/web/server/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ aiohttp-swagger[performance]==1.0.14 # via -r requirements/_base.in
aiohttp==3.6.2 # via -r requirements/../../../../packages/service-library/requirements/_base.in, aiohttp-jinja2, aiohttp-security, aiohttp-session, aiohttp-swagger, aiozipkin
aiopg[sa]==1.0.0 # via -r requirements/../../../../packages/service-library/requirements/_base.in, -r requirements/_base.in
aioredis==1.3.1 # via -r requirements/_base.in
aiormq==3.2.1 # via aio-pika
aiormq==3.2.2 # via aio-pika
aiosmtplib==1.1.3 # via -r requirements/_base.in
aiozipkin==0.6.0 # via -r requirements/../../../../packages/service-library/requirements/_base.in
amqp==2.5.2 # via kombu
Expand Down
6 changes: 3 additions & 3 deletions services/web/server/requirements/_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ aiohttp-swagger[performance]==1.0.14 # via -r requirements/_base.txt
aiohttp==3.6.2 # via -r requirements/_base.txt, aiohttp-jinja2, aiohttp-security, aiohttp-session, aiohttp-swagger, aiozipkin, pytest-aiohttp
aiopg[sa]==1.0.0 # via -r requirements/_base.txt
aioredis==1.3.1 # via -r requirements/_base.txt
aiormq==3.2.1 # via -r requirements/_base.txt, aio-pika
aiormq==3.2.2 # via -r requirements/_base.txt, aio-pika
aiosmtplib==1.1.3 # via -r requirements/_base.txt
aiozipkin==0.6.0 # via -r requirements/_base.txt
amqp==2.5.2 # via -r requirements/_base.txt, kombu
Expand All @@ -34,7 +34,7 @@ cryptography==2.9.2 # via -r requirements/_base.txt, aiohttp-session
docker==4.2.0 # via -r requirements/_test.in
docopt==0.6.2 # via coveralls
expiringdict==1.2.0 # via -r requirements/_base.txt
faker==4.0.3 # via -r requirements/_test.in
faker==4.1.0 # via -r requirements/_test.in
hiredis==1.0.1 # via -r requirements/_base.txt, aioredis
idna-ssl==1.1.0 # via -r requirements/_base.txt, aiohttp
idna==2.9 # via -r requirements/_base.txt, idna-ssl, requests, yarl
Expand Down Expand Up @@ -80,7 +80,7 @@ python-engineio==3.12.1 # via -r requirements/_base.txt, python-socketio
python-socketio==4.5.1 # via -r requirements/_base.txt
pytz==2020.1 # via -r requirements/_base.txt, celery
pyyaml==5.3.1 # via -r requirements/_base.txt, aiohttp-swagger, openapi-spec-validator
redis==3.5.0 # via -r requirements/_test.in
redis==3.5.1 # via -r requirements/_test.in
requests==2.23.0 # via codecov, coveralls, docker
semantic-version==2.8.5 # via -r requirements/_base.txt
six==1.14.0 # via -r requirements/_base.txt, astroid, cryptography, docker, isodate, jsonschema, openapi-core, openapi-spec-validator, packaging, pyrsistent, python-dateutil, python-engineio, python-socketio, tenacity, websocket-client
Expand Down
2 changes: 1 addition & 1 deletion tests/swarm-deploy/requirements/requirements.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aio-pika
coverage==4.5.1 # TODO: Downgraded because of a bug https://github.com/nedbat/coveragepy/issues/716
coverage
pytest
pytest-aiohttp
pytest-cov
Expand Down
20 changes: 10 additions & 10 deletions tests/swarm-deploy/requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@
#
aio-pika==6.6.0 # via -r requirements/requirements.in
aiohttp==3.6.2 # via pytest-aiohttp
aiormq==3.2.1 # via aio-pika
aiormq==3.2.2 # via aio-pika
async-timeout==3.0.1 # via aiohttp
attrs==19.3.0 # via aiohttp, pytest
certifi==2019.11.28 # via requests
certifi==2020.4.5.1 # via requests
chardet==3.0.4 # via aiohttp, requests
coverage==4.5.1 # via -r requirements/requirements.in, pytest-cov
coverage==5.1 # via -r requirements/requirements.in, pytest-cov
docker==4.2.0 # via -r requirements/requirements.in
idna-ssl==1.1.0 # via aiohttp
idna==2.9 # via requests, yarl
importlib-metadata==1.5.2 # via pluggy, pytest
importlib-metadata==1.6.0 # via pluggy, pytest
more-itertools==8.2.0 # via pytest
multidict==4.7.5 # via aiohttp, yarl
packaging==20.3 # via pytest, pytest-sugar
pamqp==2.3.0 # via aiormq
pluggy==0.13.1 # via pytest
py==1.8.1 # via pytest
pyparsing==2.4.6 # via packaging
pyparsing==2.4.7 # via packaging
pytest-aiohttp==0.3.0 # via -r requirements/requirements.in
pytest-cov==2.8.1 # via -r requirements/requirements.in
pytest-instafail==0.4.1.post0 # via -r requirements/requirements.in
pytest-mock==2.0.0 # via -r requirements/requirements.in
pytest-mock==3.1.0 # via -r requirements/requirements.in
pytest-runner==5.2 # via -r requirements/requirements.in
pytest-sugar==0.9.2 # via -r requirements/requirements.in
pytest-sugar==0.9.3 # via -r requirements/requirements.in
pytest==5.4.2 # via -r requirements/requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
pyyaml==5.3.1 # via -r requirements/requirements.in
requests==2.23.0 # via docker
six==1.14.0 # via docker, packaging, tenacity, websocket-client
tenacity==6.1.0 # via -r requirements/requirements.in
tenacity==6.2.0 # via -r requirements/requirements.in
termcolor==1.1.0 # via pytest-sugar
typing-extensions==3.7.4.1 # via aiohttp
urllib3==1.25.8 # via requests
typing-extensions==3.7.4.2 # via aiohttp
urllib3==1.25.9 # via requests
wcwidth==0.1.9 # via pytest
websocket-client==0.57.0 # via docker
yarl==1.4.2 # via aio-pika, aiohttp, aiormq
Expand Down