Skip to content

Commit

Permalink
Updates to FlaskAppBuilder 3.3.2+ (#17208)
Browse files Browse the repository at this point in the history
There are some clarifications about using the authentication
via FlaskAppBuilder - the change implements minimum version of the
FAB to 3.3.2 and clarifies the dependencies used in FAB 3 series
to be only authlib rather than flask-oauth.

Fixes: #16944 (this is the second, proper fix this time).
  • Loading branch information
potiuk committed Jul 28, 2021
1 parent 396f30f commit 6d7fa87
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ install_requires =
# https://github.com/readthedocs/sphinx_rtd_theme/issues/1115
docutils<0.17
flask>=1.1.0, <2.0
flask-appbuilder~=3.3
flask-appbuilder>=3.3.2, <4.0.0
flask-caching>=1.5.0, <2.0.0
flask-login>=0.3, <0.5
flask-wtf>=0.14.3, <0.15
Expand Down
10 changes: 4 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,8 @@ def write_version(filename: str = os.path.join(*[my_dir, "airflow", "git_version
facebook = [
'facebook-business>=6.0.2',
]
flask_oauth = [
'Flask-OAuthlib>=0.9.1,<0.9.6', # Flask OAuthLib 0.9.6 requires Flask-Login 0.5.0 - breaks FAB
'oauthlib!=2.0.3,!=2.0.4,!=2.0.5,<3.0.0,>=1.1.2',
'requests-oauthlib<1.2.0',
flask_appbuilder_authlib = [
'authlib',
]
google = [
'PyOpenSSL',
Expand Down Expand Up @@ -622,8 +620,8 @@ def write_version(filename: str = os.path.join(*[my_dir, "airflow", "git_version
'cncf.kubernetes': kubernetes, # also has provider, but it extends the core with the KubernetesExecutor
'dask': dask,
'deprecated_api': deprecated_api,
'github_enterprise': flask_oauth,
'google_auth': flask_oauth,
'github_enterprise': flask_appbuilder_authlib,
'google_auth': flask_appbuilder_authlib,
'kerberos': kerberos,
'ldap': ldap,
'leveldb': leveldb,
Expand Down

0 comments on commit 6d7fa87

Please sign in to comment.