From bd559b6eebb50d1d8fdc567bfef357cde48b5fc5 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 31 Jan 2019 08:50:47 +0100 Subject: [PATCH] Fix some incompatible dependencies (#3348) * Pin requests-oauthlib to work around incompatible deptree. * Update boto3/botocore to fix incompatible deptree. --- requirements.txt | 4 +++- requirements_all_ds.txt | 3 ++- requirements_dev.txt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index c078f4cdf..f2dab0eab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,8 @@ Flask-Admin==1.5.2 Flask-RESTful==0.3.5 Flask-Login==0.4.0 Flask-OAuthLib==0.9.5 +# pin this until https://github.com/lepture/flask-oauthlib/pull/388 is released +requests-oauthlib>=0.6.2,<1.2.0 Flask-SQLAlchemy==2.3.2 Flask-Migrate==2.0.1 flask-mail==0.9.1 @@ -19,7 +21,7 @@ passlib==1.6.2 aniso8601==1.1.0 blinker==1.3 psycopg2==2.7.3.2 -python-dateutil==2.7.3 +python-dateutil==2.7.5 pytz==2016.7 PyYAML==3.12 redis==3.0.1 diff --git a/requirements_all_ds.txt b/requirements_all_ds.txt index c2af9ebd7..47fc62a20 100644 --- a/requirements_all_ds.txt +++ b/requirements_all_ds.txt @@ -11,7 +11,8 @@ td-client==0.8.0 pymssql==2.1.3 dql==0.5.24 dynamo3==0.4.7 -botocore==1.10.2 +boto3==1.9.85 +botocore==1.12.85 sasl>=0.1.3 thrift>=0.8.0 thrift_sasl>=0.1.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index 85dba64f2..d0332fb2c 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -6,5 +6,5 @@ mock==2.0.0 # PyMongo and Athena dependencies are needed for some of the unit tests: # (this is not perfect and we should resolve this in a different way) pymongo[tls,srv]==3.6.1 -botocore==1.10.2 +botocore==1.12.85 PyAthena>=1.0.0