Skip to content

Commit

Permalink
Fix some incompatible dependencies (getredash#3348)
Browse files Browse the repository at this point in the history
* Pin requests-oauthlib to work around incompatible deptree.

* Update boto3/botocore to fix incompatible deptree.
  • Loading branch information
jezdez committed Feb 5, 2019
1 parent f0093ba commit d76661f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
6 changes: 4 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ httplib2==0.10.3
Flask-Admin==1.5.2
Flask-RESTful==0.3.5
Flask-Login==0.4.0
Flask-OAuthLib==0.9.3
Flask-OAuthLib==0.9.5
Flask-SQLAlchemy==2.1
# pin this until https://github.com/lepture/flask-oauthlib/pull/388 is released
requests-oauthlib>=0.6.2,<1.2.0
Flask-Migrate==2.0.1
flask-mail==0.9.1
flask-sslify==0.1.5
Expand All @@ -19,7 +21,7 @@ passlib==1.6.2
aniso8601==1.1.0
blinker==1.3
psycopg2==2.7.3.2
python-dateutil==2.4.2
python-dateutil==2.7.5
pytz==2016.7
PyYAML==3.12
redis==2.10.5
Expand Down
3 changes: 2 additions & 1 deletion requirements_all_ds.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d76661f

Please sign in to comment.