This is an automated email from the ASF dual-hosted git repository.

jscheffl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 1f622339e66 Remove deprecated code from Airbyte provider (#44577)
1f622339e66 is described below

commit 1f622339e66f462669bccc661bca629d1bf7a09d
Author: Ajit J Gupta <[email protected]>
AuthorDate: Thu Dec 5 02:17:28 2024 +0530

    Remove deprecated code from Airbyte provider (#44577)
    
    * Removed deprecated code of polling_interval
    
    * Added unit test case to check the working of poke_interval
    
    * updated CHANGELOG
---
 .../src/airflow/providers/airbyte/CHANGELOG.rst     |  9 +++++++++
 .../airflow/providers/airbyte/sensors/airbyte.py    | 21 +++++----------------
 providers/tests/airbyte/sensors/test_airbyte.py     | 12 ++++++++++++
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/providers/src/airflow/providers/airbyte/CHANGELOG.rst 
b/providers/src/airflow/providers/airbyte/CHANGELOG.rst
index 5c530c6b4c6..a3a3a9eb587 100644
--- a/providers/src/airflow/providers/airbyte/CHANGELOG.rst
+++ b/providers/src/airflow/providers/airbyte/CHANGELOG.rst
@@ -26,6 +26,15 @@
 Changelog
 ---------
 
+main
+.....
+
+.. warning::
+  All deprecated classes, parameters, and features have been removed from the 
Airbyte provider package.
+  The following breaking changes were introduced:
+
+  * Removed ``polling_interval`` parameter from ``AirbyteJobSensor``. Use the 
``poke_interval`` parameter instead.
+
 4.0.0
 .....
 
diff --git a/providers/src/airflow/providers/airbyte/sensors/airbyte.py 
b/providers/src/airflow/providers/airbyte/sensors/airbyte.py
index ad658ef47e3..bb524fc3225 100644
--- a/providers/src/airflow/providers/airbyte/sensors/airbyte.py
+++ b/providers/src/airflow/providers/airbyte/sensors/airbyte.py
@@ -20,14 +20,13 @@
 from __future__ import annotations
 
 import time
-import warnings
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any
 
 from airbyte_api.models import JobStatusEnum
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException, 
AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException
 from airflow.providers.airbyte.hooks.airbyte import AirbyteHook
 from airflow.providers.airbyte.triggers.airbyte import AirbyteSyncTrigger
 from airflow.sensors.base import BaseSensorOperator
@@ -61,20 +60,10 @@ class AirbyteJobSensor(BaseSensorOperator):
     ) -> None:
         if deferrable:
             if "poke_interval" not in kwargs:
-                # TODO: Remove once deprecated
-                if "polling_interval" in kwargs:
-                    kwargs["poke_interval"] = kwargs["polling_interval"]
-                    warnings.warn(
-                        "Argument `poll_interval` is deprecated and will be 
removed "
-                        "in a future release.  Please use `poke_interval` 
instead.",
-                        AirflowProviderDeprecationWarning,
-                        stacklevel=2,
-                    )
-                else:
-                    kwargs["poke_interval"] = 5
-
-                if "timeout" not in kwargs:
-                    kwargs["timeout"] = 60 * 60 * 24 * 7
+                kwargs["poke_interval"] = 5
+
+            if "timeout" not in kwargs:
+                kwargs["timeout"] = 60 * 60 * 24 * 7
 
         super().__init__(**kwargs)
         self.deferrable = deferrable
diff --git a/providers/tests/airbyte/sensors/test_airbyte.py 
b/providers/tests/airbyte/sensors/test_airbyte.py
index 96a06ab0c6b..aefa0b568b3 100644
--- a/providers/tests/airbyte/sensors/test_airbyte.py
+++ b/providers/tests/airbyte/sensors/test_airbyte.py
@@ -106,3 +106,15 @@ class TestAirbyteJobSensor:
             sensor.poke(context={})
 
         
mock_get_job.assert_called_once_with(request=GetJobRequest(job_id=self.job_id))
+
+    def test_airbyte_job_sensor_init(self):
+        """Test initializing AirbyteJobSensor with `poke_interval`."""
+        sensor = AirbyteJobSensor(
+            task_id="test_sensor",
+            airbyte_job_id=1,
+            deferrable=True,
+            poke_interval=10,
+            timeout=3600,
+        )
+        assert sensor.poke_interval == 10
+        assert sensor.timeout == 3600

Reply via email to