remove time folder from standard provider (apache#42392)

aws-mwaa · Sep 21, 2024 · 4c2c407 · 4c2c407
1 parent 0bd70fd
commit 4c2c407
Show file tree

Hide file tree

Showing 25 changed files with 22 additions and 54 deletions.
diff --git a/airflow/example_dags/example_branch_datetime_operator.py b/airflow/example_dags/example_branch_datetime_operator.py
@@ -26,7 +26,7 @@
 
 from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
-from airflow.providers.standard.time.operators.datetime import BranchDateTimeOperator
+from airflow.providers.standard.operators.datetime import BranchDateTimeOperator
 
 dag1 = DAG(
     dag_id="example_branch_datetime_operator",

diff --git a/airflow/example_dags/example_branch_day_of_week_operator.py b/airflow/example_dags/example_branch_day_of_week_operator.py
@@ -25,7 +25,7 @@
 
 from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
-from airflow.providers.standard.time.operators.weekday import BranchDayOfWeekOperator
+from airflow.providers.standard.operators.weekday import BranchDayOfWeekOperator
 from airflow.utils.weekday import WeekDay
 
 with DAG(

diff --git a/airflow/example_dags/example_sensors.py b/airflow/example_dags/example_sensors.py
@@ -23,9 +23,9 @@
 
 from airflow.models.dag import DAG
 from airflow.operators.bash import BashOperator
-from airflow.providers.standard.time.sensors.time import TimeSensor, TimeSensorAsync
-from airflow.providers.standard.time.sensors.time_delta import TimeDeltaSensor, TimeDeltaSensorAsync
-from airflow.providers.standard.time.sensors.weekday import DayOfWeekSensor
+from airflow.providers.standard.sensors.time import TimeSensor, TimeSensorAsync
+from airflow.providers.standard.sensors.time_delta import TimeDeltaSensor, TimeDeltaSensorAsync
+from airflow.providers.standard.sensors.weekday import DayOfWeekSensor
 from airflow.sensors.bash import BashSensor
 from airflow.sensors.filesystem import FileSensor
 from airflow.sensors.python import PythonSensor

diff --git a/airflow/example_dags/example_time_delta_sensor_async.py b/airflow/example_dags/example_time_delta_sensor_async.py
@@ -28,7 +28,7 @@
 
 from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
-from airflow.providers.standard.time.sensors.time_delta import TimeDeltaSensorAsync
+from airflow.providers.standard.sensors.time_delta import TimeDeltaSensorAsync
 
 with DAG(
     dag_id="example_time_delta_sensor_async",

diff --git a/airflow/providers/standard/time/__init__.py → .../providers/standard/operators/__init__.py b/airflow/providers/standard/time/__init__.py → .../providers/standard/operators/__init__.py
diff --git a/...iders/standard/time/operators/datetime.py → .../providers/standard/operators/datetime.py b/...iders/standard/time/operators/datetime.py → .../providers/standard/operators/datetime.py
diff --git a/...viders/standard/time/operators/weekday.py → ...w/providers/standard/operators/weekday.py b/...viders/standard/time/operators/weekday.py → ...w/providers/standard/operators/weekday.py
diff --git a/airflow/providers/standard/provider.yaml b/airflow/providers/standard/provider.yaml
@@ -40,13 +40,13 @@ integrations:
 operators:
   - integration-name: Standard
     python-modules:
-      - airflow.providers.standard.time.operators.datetime
-      - airflow.providers.standard.time.operators.weekday
+      - airflow.providers.standard.operators.datetime
+      - airflow.providers.standard.operators.weekday
 
 sensors:
   - integration-name: Standard
     python-modules:
-      - airflow.providers.standard.time.sensors.date_time
-      - airflow.providers.standard.time.sensors.time_delta
-      - airflow.providers.standard.time.sensors.time
-      - airflow.providers.standard.time.sensors.weekday
+      - airflow.providers.standard.sensors.date_time
+      - airflow.providers.standard.sensors.time_delta
+      - airflow.providers.standard.sensors.time
+      - airflow.providers.standard.sensors.weekday
diff --git a/...iders/standard/time/operators/__init__.py → ...ow/providers/standard/sensors/__init__.py b/...iders/standard/time/operators/__init__.py → ...ow/providers/standard/sensors/__init__.py
diff --git a/...viders/standard/time/sensors/date_time.py → ...w/providers/standard/sensors/date_time.py b/...viders/standard/time/sensors/date_time.py → ...w/providers/standard/sensors/date_time.py
diff --git a/...w/providers/standard/time/sensors/time.py → airflow/providers/standard/sensors/time.py b/...w/providers/standard/time/sensors/time.py → airflow/providers/standard/sensors/time.py
diff --git a/...iders/standard/time/sensors/time_delta.py → .../providers/standard/sensors/time_delta.py b/...iders/standard/time/sensors/time_delta.py → .../providers/standard/sensors/time_delta.py
diff --git a/...roviders/standard/time/sensors/weekday.py → ...low/providers/standard/sensors/weekday.py b/...roviders/standard/time/sensors/weekday.py → ...low/providers/standard/sensors/weekday.py
diff --git a/tests/dags/test_sensor.py b/tests/dags/test_sensor.py
@@ -20,7 +20,7 @@
 
 from airflow.decorators import task
 from airflow.models.dag import DAG
-from airflow.providers.standard.time.sensors.date_time import DateTimeSensor
+from airflow.providers.standard.sensors.date_time import DateTimeSensor
 from airflow.utils import timezone
 
 with DAG(

diff --git a/...oviders/standard/time/sensors/__init__.py → .../providers/standard/operators/__init__.py b/...oviders/standard/time/sensors/__init__.py → .../providers/standard/operators/__init__.py
diff --git a/.../standard/time/operators/test_datetime.py → ...iders/standard/operators/test_datetime.py b/.../standard/time/operators/test_datetime.py → ...iders/standard/operators/test_datetime.py
@@ -26,7 +26,7 @@
 from airflow.models.dagrun import DagRun
 from airflow.models.taskinstance import TaskInstance as TI
 from airflow.operators.empty import EmptyOperator
-from airflow.providers.standard.time.operators.datetime import BranchDateTimeOperator
+from airflow.providers.standard.operators.datetime import BranchDateTimeOperator
 from airflow.utils import timezone
 from airflow.utils.session import create_session
 from airflow.utils.state import State

diff --git a/...s/standard/time/operators/test_weekday.py → ...viders/standard/operators/test_weekday.py b/...s/standard/time/operators/test_weekday.py → ...viders/standard/operators/test_weekday.py
@@ -27,7 +27,7 @@
 from airflow.models.taskinstance import TaskInstance as TI
 from airflow.models.xcom import XCom
 from airflow.operators.empty import EmptyOperator
-from airflow.providers.standard.time.operators.weekday import BranchDayOfWeekOperator
+from airflow.providers.standard.operators.weekday import BranchDayOfWeekOperator
 from airflow.utils import timezone
 from airflow.utils.session import create_session
 from airflow.utils.state import State

diff --git a/tests/providers/standard/time/__init__.py → tests/providers/standard/sensors/__init__.py b/tests/providers/standard/time/__init__.py → tests/providers/standard/sensors/__init__.py
diff --git a/...s/standard/time/sensors/test_date_time.py → ...viders/standard/sensors/test_date_time.py b/...s/standard/time/sensors/test_date_time.py → ...viders/standard/sensors/test_date_time.py
@@ -22,7 +22,7 @@
 import pytest
 
 from airflow.models.dag import DAG
-from airflow.providers.standard.time.sensors.date_time import DateTimeSensor
+from airflow.providers.standard.sensors.date_time import DateTimeSensor
 from airflow.utils import timezone
 
 DEFAULT_DATE = timezone.datetime(2015, 1, 1)
@@ -84,7 +84,7 @@ def test_invalid_input(self):
         ],
     )
     @patch(
-        "airflow.providers.standard.time.sensors.date_time.timezone.utcnow",
+        "airflow.providers.standard.sensors.date_time.timezone.utcnow",
         return_value=timezone.datetime(2020, 1, 1, 23, 0, tzinfo=timezone.utc),
     )
     def test_poke(self, mock_utcnow, task_id, target_time, expected):

diff --git a/...viders/standard/time/sensors/test_time.py → ...s/providers/standard/sensors/test_time.py b/...viders/standard/time/sensors/test_time.py → ...s/providers/standard/sensors/test_time.py
@@ -25,7 +25,7 @@
 
 from airflow.exceptions import TaskDeferred
 from airflow.models.dag import DAG
-from airflow.providers.standard.time.sensors.time import TimeSensor, TimeSensorAsync
+from airflow.providers.standard.sensors.time import TimeSensor, TimeSensorAsync
 from airflow.triggers.temporal import DateTimeTrigger
 from airflow.utils import timezone
 

diff --git a/.../standard/time/sensors/test_time_delta.py → ...iders/standard/sensors/test_time_delta.py b/.../standard/time/sensors/test_time_delta.py → ...iders/standard/sensors/test_time_delta.py
@@ -26,7 +26,7 @@
 
 from airflow.models import DagBag
 from airflow.models.dag import DAG
-from airflow.providers.standard.time.sensors.time_delta import (
+from airflow.providers.standard.sensors.time_delta import (
     TimeDeltaSensor,
     TimeDeltaSensorAsync,
     WaitSensor,
@@ -81,7 +81,7 @@ def test_timedelta_sensor(self, defer_mock, should_defer):
         [False, True],
     )
     @mock.patch("airflow.models.baseoperator.BaseOperator.defer")
-    @mock.patch("airflow.providers.standard.time.sensors.time_delta.sleep")
+    @mock.patch("airflow.providers.standard.sensors.time_delta.sleep")
     def test_wait_sensor(self, sleep_mock, defer_mock, should_defer):
         wait_time = timedelta(seconds=30)
         op = WaitSensor(

diff --git a/...ers/standard/time/sensors/test_weekday.py → ...roviders/standard/sensors/test_weekday.py b/...ers/standard/time/sensors/test_weekday.py → ...roviders/standard/sensors/test_weekday.py
@@ -24,7 +24,7 @@
 from airflow.exceptions import AirflowSensorTimeout
 from airflow.models import DagBag
 from airflow.models.dag import DAG
-from airflow.providers.standard.time.sensors.weekday import DayOfWeekSensor
+from airflow.providers.standard.sensors.weekday import DayOfWeekSensor
 from airflow.utils.timezone import datetime
 from airflow.utils.weekday import WeekDay
 from tests.test_utils import db

diff --git a/tests/providers/standard/time/operators/__init__.py b/tests/providers/standard/time/operators/__init__.py
diff --git a/tests/providers/standard/time/sensors/__init__.py b/tests/providers/standard/time/sensors/__init__.py
diff --git a/tests/sensors/test_external_task_sensor.py b/tests/sensors/test_external_task_sensor.py
@@ -38,7 +38,7 @@
 from airflow.operators.bash import BashOperator
 from airflow.operators.empty import EmptyOperator
 from airflow.operators.python import PythonOperator
-from airflow.providers.standard.time.sensors.time import TimeSensor
+from airflow.providers.standard.sensors.time import TimeSensor
 from airflow.sensors.external_task import (
     ExternalTaskMarker,
     ExternalTaskSensor,