From 2a0f052c2adf5f280b1411bb08e034dc467b01d0 Mon Sep 17 00:00:00 2001 From: vincbeck Date: Tue, 12 Nov 2024 11:12:34 -0500 Subject: [PATCH] Prepare FAB provider to set next version as major version --- dev/breeze/src/airflow_breeze/global_constants.py | 4 ++-- dev/breeze/tests/test_packages.py | 8 ++++---- generated/provider_dependencies.json | 2 +- providers/src/airflow/providers/fab/CHANGELOG.rst | 11 +++++++++++ providers/src/airflow/providers/fab/provider.yaml | 2 +- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py index 15cd0ac81cc5..aff93ba0bdca 100644 --- a/dev/breeze/src/airflow_breeze/global_constants.py +++ b/dev/breeze/src/airflow_breeze/global_constants.py @@ -581,13 +581,13 @@ def get_airflow_extras(): { "python-version": "3.9", "airflow-version": "2.9.3", - "remove-providers": "cloudant edge", + "remove-providers": "cloudant fab edge", "run-tests": "true", }, { "python-version": "3.9", "airflow-version": "2.10.3", - "remove-providers": "cloudant", + "remove-providers": "cloudant fab", "run-tests": "true", }, ] diff --git a/dev/breeze/tests/test_packages.py b/dev/breeze/tests/test_packages.py index fe3173b2e9dd..bccc26259d59 100644 --- a/dev/breeze/tests/test_packages.py +++ b/dev/breeze/tests/test_packages.py @@ -168,7 +168,7 @@ def test_get_documentation_package_path(): "", """ "apache-airflow-providers-common-compat>=1.2.1", - "apache-airflow>=2.9.0", + "apache-airflow>=3.0.0.dev0", "flask-appbuilder==4.5.2", "flask-login>=0.6.2", "flask>=2.2,<2.3", @@ -182,7 +182,7 @@ def test_get_documentation_package_path(): "dev0", """ "apache-airflow-providers-common-compat>=1.2.1.dev0", - "apache-airflow>=2.9.0.dev0", + "apache-airflow>=3.0.0.dev0", "flask-appbuilder==4.5.2", "flask-login>=0.6.2", "flask>=2.2,<2.3", @@ -196,7 +196,7 @@ def test_get_documentation_package_path(): "beta0", """ "apache-airflow-providers-common-compat>=1.2.1b0", - "apache-airflow>=2.9.0b0", + "apache-airflow>=3.0.0b0", "flask-appbuilder==4.5.2", "flask-login>=0.6.2", "flask>=2.2,<2.3", @@ -440,7 +440,7 @@ def test_validate_provider_info_with_schema(): "provider_id, min_version", [ ("amazon", "2.8.0"), - ("fab", "2.9.0"), + ("fab", "3.0.0.dev0"), ], ) def test_get_min_airflow_version(provider_id: str, min_version: str): diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index 0fd840c1a9f1..6cf06731c118 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -576,7 +576,7 @@ "fab": { "deps": [ "apache-airflow-providers-common-compat>=1.2.1", - "apache-airflow>=2.9.0", + "apache-airflow>=3.0.0.dev0", "flask-appbuilder==4.5.2", "flask-login>=0.6.2", "flask>=2.2,<2.3", diff --git a/providers/src/airflow/providers/fab/CHANGELOG.rst b/providers/src/airflow/providers/fab/CHANGELOG.rst index fd62c0c964ce..94996686eed0 100644 --- a/providers/src/airflow/providers/fab/CHANGELOG.rst +++ b/providers/src/airflow/providers/fab/CHANGELOG.rst @@ -20,6 +20,17 @@ Changelog --------- +2.0.0 +..... + +Breaking changes +~~~~~~~~~~~~~~~~ + +.. warning:: + The new version of the Fab provider is only compatible with Airflow 3. + It is impossible to use ``apache-airflow-providers-fab`` >= 2.0 with Airflow 2.X. + If you use Airflow 2.X, please use ``apache-airflow-providers-fab`` 1.X. + 1.5.0 ..... diff --git a/providers/src/airflow/providers/fab/provider.yaml b/providers/src/airflow/providers/fab/provider.yaml index 2694cc6da37c..5930c5935a40 100644 --- a/providers/src/airflow/providers/fab/provider.yaml +++ b/providers/src/airflow/providers/fab/provider.yaml @@ -48,7 +48,7 @@ versions: - 1.0.0 dependencies: - - apache-airflow>=2.9.0 + - apache-airflow>=3.0.0.dev0 - apache-airflow-providers-common-compat>=1.2.1 - flask>=2.2,<2.3 # We are tightly coupled with FAB version as we vendored-in part of FAB code related to security manager