From 20ac4bd3dd380b311c3b6f570c55a939e1d1399a Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Tue, 5 Mar 2019 07:34:30 -0800 Subject: [PATCH 1/2] downgrade kombu --- requirements-docs.txt | 8 ++++---- requirements-tests.txt | 4 ++-- requirements.txt | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index 50a2a077..894defcb 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -7,7 +7,7 @@ acme==0.31.0 alabaster==0.7.12 # via sphinx alembic-autogenerate-enums==0.0.2 -alembic==1.0.7 +alembic==1.0.8 amqp==2.4.2 aniso8601==5.1.0 arrow==0.13.1 @@ -17,8 +17,8 @@ babel==2.6.0 # via sphinx bcrypt==3.1.6 billiard==3.5.0.5 blinker==1.4 -boto3==1.9.106 -botocore==1.12.106 +boto3==1.9.107 +botocore==1.12.107 celery[redis]==4.2.1 certifi==2018.11.29 certsrv==2.1.1 @@ -90,7 +90,7 @@ sphinx==1.8.4 sphinxcontrib-httpdomain==1.7.0 sphinxcontrib-websupport==1.1.0 # via sphinx sqlalchemy-utils==0.33.11 -sqlalchemy==1.2.18 +sqlalchemy==1.3.0 tabulate==0.8.3 urllib3==1.24.1 vine==1.2.0 diff --git a/requirements-tests.txt b/requirements-tests.txt index 84c59d0d..55e38cbf 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -8,9 +8,9 @@ asn1crypto==0.24.0 # via cryptography atomicwrites==1.3.0 # via pytest attrs==19.1.0 # via pytest aws-xray-sdk==0.95 # via moto -boto3==1.9.106 # via moto +boto3==1.9.107 # via moto boto==2.49.0 # via moto -botocore==1.12.106 # via boto3, moto, s3transfer +botocore==1.12.107 # via boto3, moto, s3transfer certifi==2018.11.29 # via requests cffi==1.12.2 # via cryptography chardet==3.0.4 # via requests diff --git a/requirements.txt b/requirements.txt index dd442b5f..cf2be225 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ # acme==0.31.0 alembic-autogenerate-enums==0.0.2 -alembic==1.0.7 # via flask-migrate +alembic==1.0.8 # via flask-migrate amqp==2.4.2 # via kombu aniso8601==5.1.0 # via flask-restful, relativetimebuilder arrow==0.13.1 @@ -15,8 +15,8 @@ asyncpool==1.0 bcrypt==3.1.6 # via flask-bcrypt, paramiko billiard==3.5.0.5 # via celery blinker==1.4 # via flask-mail, flask-principal, raven -boto3==1.9.106 -botocore==1.12.106 +boto3==1.9.107 +botocore==1.12.107 celery[redis]==4.2.1 certifi==2018.11.29 certsrv==2.1.1 @@ -80,7 +80,7 @@ retrying==1.3.3 s3transfer==0.2.0 # via boto3 six==1.12.0 sqlalchemy-utils==0.33.11 -sqlalchemy==1.2.18 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils +sqlalchemy==1.3.0 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils tabulate==0.8.3 urllib3==1.24.1 # via botocore, requests vine==1.2.0 # via amqp From 077ae1eedd7b827b809bb2908a20491342a331a0 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Tue, 5 Mar 2019 09:45:59 -0800 Subject: [PATCH 2/2] Downgrade Kombu for real this time --- requirements-docs.txt | 2 +- requirements.in | 1 + requirements.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index 894defcb..e936c197 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -50,7 +50,7 @@ jinja2==2.10 jmespath==0.9.4 josepy==1.1.0 jsonlines==1.2.0 -kombu==4.4.0 +kombu==4.3.0 lockfile==0.12.2 mako==1.0.7 markupsafe==1.1.1 diff --git a/requirements.in b/requirements.in index b085f5c7..e3d0c66b 100644 --- a/requirements.in +++ b/requirements.in @@ -26,6 +26,7 @@ future gunicorn inflection jinja2 +kombu==4.3.0 # kombu 4.4.0 requires redis 3 lockfile marshmallow-sqlalchemy marshmallow diff --git a/requirements.txt b/requirements.txt index cf2be225..2aa5f157 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,7 +47,7 @@ jinja2==2.10 jmespath==0.9.4 # via boto3, botocore josepy==1.1.0 # via acme jsonlines==1.2.0 # via cloudflare -kombu==4.4.0 # via celery +kombu==4.3.0 lockfile==0.12.2 mako==1.0.7 # via alembic markupsafe==1.1.1 # via jinja2, mako