From d3f6fccc24c81b82cb4d43ba3272a65e21f5b0b1 Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Wed, 23 Oct 2024 13:49:19 +0100 Subject: [PATCH] Bump Flask-AppBuilder to ``4.5.2`` https://pypi.org/project/Flask-AppBuilder/4.5.2/ # Conflicts: # dev/breeze/tests/test_packages.py # generated/provider_dependencies.json # providers/src/airflow/providers/fab/provider.yaml --- Dockerfile.ci | 2 +- dev/breeze/tests/test_packages.py | 6 +++--- generated/provider_dependencies.json | 2 +- hatch_build.py | 7 ------- providers/src/airflow/providers/fab/provider.yaml | 2 +- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index cdf80c9b91593..88eec69a24e35 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1195,7 +1195,7 @@ ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow" # NOTE! When you want to make sure dependencies are installed from scratch in your PR after removing # some dependencies, you also need to set "disable image cache" in your PR to make sure the image is # not built using the "main" version of those dependencies. -ARG DEPENDENCIES_EPOCH_NUMBER="12" +ARG DEPENDENCIES_EPOCH_NUMBER="13" # Make sure noninteractive debian install is used and language variables set ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE} \ diff --git a/dev/breeze/tests/test_packages.py b/dev/breeze/tests/test_packages.py index 6cac54a14c31a..c8b4596b03f9b 100644 --- a/dev/breeze/tests/test_packages.py +++ b/dev/breeze/tests/test_packages.py @@ -169,7 +169,7 @@ def test_get_documentation_package_path(): """ "apache-airflow-providers-common-compat>=1.2.1", "apache-airflow>=2.9.0", - "flask-appbuilder==4.5.1", + "flask-appbuilder==4.5.2", "flask-login>=0.6.2", "flask>=2.2,<2.3", "google-re2>=1.0", @@ -183,7 +183,7 @@ def test_get_documentation_package_path(): """ "apache-airflow-providers-common-compat>=1.2.1.dev0", "apache-airflow>=2.9.0.dev0", - "flask-appbuilder==4.5.1", + "flask-appbuilder==4.5.2", "flask-login>=0.6.2", "flask>=2.2,<2.3", "google-re2>=1.0", @@ -197,7 +197,7 @@ def test_get_documentation_package_path(): """ "apache-airflow-providers-common-compat>=1.2.1b0", "apache-airflow>=2.9.0b0", - "flask-appbuilder==4.5.1", + "flask-appbuilder==4.5.2", "flask-login>=0.6.2", "flask>=2.2,<2.3", "google-re2>=1.0", diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index a5c97c51237a0..c483d38c55e3e 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -571,7 +571,7 @@ "deps": [ "apache-airflow-providers-common-compat>=1.2.1", "apache-airflow>=2.9.0", - "flask-appbuilder==4.5.1", + "flask-appbuilder==4.5.2", "flask-login>=0.6.2", "flask>=2.2,<2.3", "google-re2>=1.0", diff --git a/hatch_build.py b/hatch_build.py index 1b8d4fd6f6f44..d30ee3f3b8b5f 100644 --- a/hatch_build.py +++ b/hatch_build.py @@ -379,13 +379,6 @@ # all parameters now are mandatory which make AirflowDatabaseSessionInterface incompatible with this version. "flask-session>=0.4.0,<0.6", "flask-wtf>=1.1.0", - # WTForms are limited to 3.2.0 because of the error in tests. We technically do not need it directly - # as this is a dependency of Flask-WTF, but we need to specify it here to add the limitation - # The issue to track it is https://github.com/pallets-eco/wtforms/issues/863 - # Note. 3.2.0 has been broken because of imports https://github.com/pallets-eco/wtforms/issues/861 which - # was fixed in 3.2.1, but after import was fixed, the tests started to work with 3.2.1 - # when the issue 863 is fixed, we should likely leave the line below and specify !=3.2.0,!=3.2.1 - "wtforms>=3.1.0,<3.2.0", # Flask 2.3 is scheduled to introduce a number of deprecation removals - some of them might be breaking # for our dependencies - notably `_app_ctx_stack` and `_request_ctx_stack` removals. # We should remove the limitation after 2.3 is released and our dependencies are updated to handle it diff --git a/providers/src/airflow/providers/fab/provider.yaml b/providers/src/airflow/providers/fab/provider.yaml index 86b0598df4533..fe8e0b9753474 100644 --- a/providers/src/airflow/providers/fab/provider.yaml +++ b/providers/src/airflow/providers/fab/provider.yaml @@ -55,7 +55,7 @@ dependencies: # Every time we update FAB version here, please make sure that you review the classes and models in # `airflow/providers/fab/auth_manager/security_manager/override.py` with their upstream counterparts. # In particular, make sure any breaking changes, for example any new methods, are accounted for. - - flask-appbuilder==4.5.1 + - flask-appbuilder==4.5.2 - flask-login>=0.6.2 - google-re2>=1.0 - jmespath>=0.7.0