Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[AIRFLOW-4246] RBAC Flask-OAuthlib breaks due to dependencies #5045

Merged
merged 1 commit into from
Apr 5, 2019
Merged

[AIRFLOW-4246] RBAC Flask-OAuthlib breaks due to dependencies #5045

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,12 @@ def write_version(filename=os.path.join(*['airflow',
'PyOpenSSL',
'pandas-gbq'
]
github_enterprise = ['Flask-OAuthlib>=0.9.1']
grpc = ['grpcio>=1.15.0']
google_auth = ['Flask-OAuthlib>=0.9.1']
flask_oauth = [
'Flask-OAuthlib>=0.9.1',
'oauthlib!=2.0.3,!=2.0.4,!=2.0.5,<3.0.0,>=1.1.2',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My that's quite the version specificiation! Where did it come from?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've based it on the master branch of the Flask-OAuthlib git repository:

https://github.com/lepture/flask-oauthlib/blob/9e6f152a5bb360e7496210da21561c3e6d41b0e1/setup.py#L44-L47

There were 2 commits to pin these versions:

lepture/flask-oauthlib@bd06c64
lepture/flask-oauthlib@1379c6b

Similar to #5036, we can unpin these once a new release of Flask-OAuthlib is released which includes the above changes.

'requests-oauthlib==1.1.0'
]
hdfs = ['snakebite>=2.7.8']
hive = [
'hmsclient>=0.1.0',
Expand Down Expand Up @@ -357,8 +360,8 @@ def do_setup():
'elasticsearch': elasticsearch,
'gcp': gcp,
'gcp_api': gcp, # TODO: remove this in Airflow 2.1
'github_enterprise': github_enterprise,
'google_auth': google_auth,
'github_enterprise': flask_oauth,
'google_auth': flask_oauth,
'grpc': grpc,
'hdfs': hdfs,
'hive': hive,
Expand Down