This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-1-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 3c0f4d9908a81b662296e747230dba5ddb96f213 Author: Jarek Potiuk <ja...@potiuk.com> AuthorDate: Wed Jul 28 21:37:48 2021 +0200 Updates to FlaskAppBuilder 3.3.2+ (#17208) 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). (cherry picked from commit 6d7fa874ff201af7f602be9c58a827998814bdd1) --- setup.cfg | 2 +- setup.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/setup.cfg b/setup.cfg index fbe58cb..d3c5f57 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 diff --git a/setup.py b/setup.py index 46ff73d..c74808a 100644 --- a/setup.py +++ b/setup.py @@ -270,10 +270,8 @@ exasol = [ 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', @@ -622,8 +620,8 @@ CORE_EXTRAS_REQUIREMENTS: Dict[str, List[str]] = { '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,