merge with main

apache · May 1, 2024 · 9710a4e · 9710a4e
1 parent d7c6bf6
commit 9710a4e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/airflow/providers/apache/iceberg/__init__.py b/airflow/providers/apache/iceberg/__init__.py
@@ -38,5 +38,5 @@
     "2.7.0"
 ):
     raise RuntimeError(
-        f"The package `apache-airflow-providers-apache-iceberg:{__version__}` needs Apache Airflow 2.6.0+"
+        f"The package `apache-airflow-providers-apache-iceberg:{__version__}` needs Apache Airflow 2.7.0+"
     )
diff --git a/airflow/providers/tabular/hook/__init__.py → airflow/providers/tabular/hooks/__init__.py b/airflow/providers/tabular/hook/__init__.py → airflow/providers/tabular/hooks/__init__.py
diff --git a/airflow/providers/tabular/hook/tabular.py → airflow/providers/tabular/hooks/tabular.py b/airflow/providers/tabular/hook/tabular.py → airflow/providers/tabular/hooks/tabular.py
@@ -21,10 +21,11 @@
 
 import warnings
 
+from airflow.exceptions import AirflowProviderDeprecationWarning
 from airflow.providers.apache.iceberg.hooks.iceberg import IcebergHook  # noqa: F401
 
 warnings.warn(
     "This module is deprecated. Please use `airflow.providers.apache.iceberg.hooks.iceberg`.",
-    DeprecationWarning,
+    AirflowProviderDeprecationWarning,
     stacklevel=2,
 )
diff --git a/airflow/providers/tabular/provider.yaml b/airflow/providers/tabular/provider.yaml
@@ -36,7 +36,7 @@ versions:
   - 1.0.0
 
 dependencies:
-  - apache-airflow>=2.6.0
+  - apache-airflow>=2.7.0
   - apache-airflow-providers-apache-iceberg
 
 devel-dependencies:

diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json
@@ -168,7 +168,7 @@
   },
   "apache.iceberg": {
     "deps": [
-      "apache-airflow>=2.6.0"
+      "apache-airflow>=2.7.0"
     ],
     "devel-deps": [
       "pyiceberg>=0.5.0"
@@ -1118,23 +1118,15 @@
   },
   "tabular": {
     "deps": [
-<<<<<<< HEAD
-      "apache-airflow>=2.7.0"
-=======
       "apache-airflow-providers-apache-iceberg",
-      "apache-airflow>=2.6.0"
->>>>>>> 6a75b87b4b (add tabular deprecation)
+      "apache-airflow>=2.7.0"
     ],
     "devel-deps": [
       "pyiceberg>=0.5.0"
     ],
-<<<<<<< HEAD
-    "cross-providers-deps": [],
-=======
     "cross-providers-deps": [
       "apache.iceberg"
     ],
->>>>>>> 6a75b87b4b (add tabular deprecation)
     "excluded-python-versions": [],
     "state": "ready"
   },