apache · gopidesupavan · Oct 31, 2024 · Aug 18, 2024 · Aug 19, 2024 · Aug 19, 2024
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -724,7 +724,7 @@ repos:
         files: >
           (?x)
           ^providers/src/airflow/providers/.*\.py$
-        exclude: ^.*/.*_vendor/|providers/src/airflow/providers/standard/operators/bash.py
+        exclude: ^.*/.*_vendor/|providers/src/airflow/providers/standard/operators/bash.py|providers/src/airflow/providers/standard/operators/python.py
       - id: check-get-lineage-collector-providers
         language: python
         name: Check providers import hook lineage code from compat

diff --git a/airflow/decorators/branch_external_python.py b/airflow/decorators/branch_external_python.py
@@ -20,7 +20,7 @@
 
 from airflow.decorators.base import task_decorator_factory
 from airflow.decorators.python import _PythonDecoratedOperator
-from airflow.operators.python import BranchExternalPythonOperator
+from airflow.providers.standard.operators.python import BranchExternalPythonOperator
 
 if TYPE_CHECKING:
     from airflow.decorators.base import TaskDecorator

diff --git a/airflow/decorators/branch_python.py b/airflow/decorators/branch_python.py
@@ -20,7 +20,7 @@
 
 from airflow.decorators.base import task_decorator_factory
 from airflow.decorators.python import _PythonDecoratedOperator
-from airflow.operators.python import BranchPythonOperator
+from airflow.providers.standard.operators.python import BranchPythonOperator
 
 if TYPE_CHECKING:
     from airflow.decorators.base import TaskDecorator

diff --git a/airflow/decorators/branch_virtualenv.py b/airflow/decorators/branch_virtualenv.py
@@ -20,7 +20,7 @@
 
 from airflow.decorators.base import task_decorator_factory
 from airflow.decorators.python import _PythonDecoratedOperator
-from airflow.operators.python import BranchPythonVirtualenvOperator
+from airflow.providers.standard.operators.python import BranchPythonVirtualenvOperator
 
 if TYPE_CHECKING:
     from airflow.decorators.base import TaskDecorator

diff --git a/airflow/decorators/external_python.py b/airflow/decorators/external_python.py
@@ -20,7 +20,7 @@
 
 from airflow.decorators.base import task_decorator_factory
 from airflow.decorators.python import _PythonDecoratedOperator
-from airflow.operators.python import ExternalPythonOperator
+from airflow.providers.standard.operators.python import ExternalPythonOperator
 
 if TYPE_CHECKING:
     from airflow.decorators.base import TaskDecorator

diff --git a/airflow/decorators/python.py b/airflow/decorators/python.py
@@ -19,7 +19,7 @@
 from typing import TYPE_CHECKING, Callable, Sequence
 
 from airflow.decorators.base import DecoratedOperator, task_decorator_factory
-from airflow.operators.python import PythonOperator
+from airflow.providers.standard.operators.python import PythonOperator
 
 if TYPE_CHECKING:
     from airflow.decorators.base import TaskDecorator

diff --git a/airflow/decorators/python_virtualenv.py b/airflow/decorators/python_virtualenv.py
@@ -20,7 +20,7 @@
 
 from airflow.decorators.base import task_decorator_factory
 from airflow.decorators.python import _PythonDecoratedOperator
-from airflow.operators.python import PythonVirtualenvOperator
+from airflow.providers.standard.operators.python import PythonVirtualenvOperator
 
 if TYPE_CHECKING:
     from airflow.decorators.base import TaskDecorator

diff --git a/airflow/decorators/sensor.py b/airflow/decorators/sensor.py
@@ -20,7 +20,7 @@
 from typing import TYPE_CHECKING, Callable, ClassVar, Sequence
 
 from airflow.decorators.base import get_unique_task_id, task_decorator_factory
-from airflow.sensors.python import PythonSensor
+from airflow.providers.standard.sensors.python import PythonSensor
 
 if TYPE_CHECKING:
     from airflow.decorators.base import TaskDecorator

diff --git a/airflow/decorators/short_circuit.py b/airflow/decorators/short_circuit.py
@@ -20,7 +20,7 @@
 
 from airflow.decorators.base import task_decorator_factory
 from airflow.decorators.python import _PythonDecoratedOperator
-from airflow.operators.python import ShortCircuitOperator
+from airflow.providers.standard.operators.python import ShortCircuitOperator
 
 if TYPE_CHECKING:
     from airflow.decorators.base import TaskDecorator

diff --git a/airflow/example_dags/example_asset_alias_with_no_taskflow.py b/airflow/example_dags/example_asset_alias_with_no_taskflow.py
@@ -37,7 +37,7 @@
 
 from airflow import DAG
 from airflow.assets import Asset, AssetAlias
-from airflow.operators.python import PythonOperator
+from airflow.providers.standard.operators.python import PythonOperator
 
 with DAG(
     dag_id="asset_s3_bucket_producer_with_no_taskflow",

diff --git a/airflow/example_dags/example_branch_operator.py b/airflow/example_dags/example_branch_operator.py
@@ -29,12 +29,12 @@
 
 import pendulum
 
-from airflow.operators.python import is_venv_installed
+from airflow.providers.standard.operators.python import is_venv_installed
 
 if is_venv_installed():
     from airflow.models.dag import DAG
     from airflow.operators.empty import EmptyOperator
-    from airflow.operators.python import (
+    from airflow.providers.standard.operators.python import (
         BranchExternalPythonOperator,
         BranchPythonOperator,
         BranchPythonVirtualenvOperator,

diff --git a/airflow/example_dags/example_branch_operator_decorator.py b/airflow/example_dags/example_branch_operator_decorator.py
@@ -30,7 +30,7 @@
 
 import pendulum
 
-from airflow.operators.python import is_venv_installed
+from airflow.providers.standard.operators.python import is_venv_installed
 
 if is_venv_installed():
     from airflow.decorators import task

diff --git a/airflow/example_dags/example_python_context_decorator.py b/airflow/example_dags/example_python_context_decorator.py
@@ -45,7 +45,7 @@ def print_context() -> str:
         """Print the Airflow context."""
         from pprint import pprint
 
-        from airflow.operators.python import get_current_context
+        from airflow.providers.standard.operators.python import get_current_context
 
         context = get_current_context()
         pprint(context)
@@ -60,7 +60,7 @@ def print_context_venv() -> str:
         """Print the Airflow context in venv."""
         from pprint import pprint
 
-        from airflow.operators.python import get_current_context
+        from airflow.providers.standard.operators.python import get_current_context
 
         context = get_current_context()
         pprint(context)
@@ -77,7 +77,7 @@ def print_context_external() -> str:
         """Print the Airflow context in external python."""
         from pprint import pprint
 
-        from airflow.operators.python import get_current_context
+        from airflow.providers.standard.operators.python import get_current_context
 
         context = get_current_context()
         pprint(context)

diff --git a/airflow/example_dags/example_python_context_operator.py b/airflow/example_dags/example_python_context_operator.py
@@ -28,7 +28,11 @@
 import pendulum
 
 from airflow import DAG
-from airflow.operators.python import ExternalPythonOperator, PythonOperator, PythonVirtualenvOperator
+from airflow.providers.standard.operators.python import (
+    ExternalPythonOperator,
+    PythonOperator,
+    PythonVirtualenvOperator,
+)
 
 SOME_EXTERNAL_PYTHON = sys.executable
 
@@ -44,7 +48,7 @@ def print_context() -> str:
         """Print the Airflow context."""
         from pprint import pprint
 
-        from airflow.operators.python import get_current_context
+        from airflow.providers.standard.operators.python import get_current_context
 
         context = get_current_context()
         pprint(context)
@@ -58,7 +62,7 @@ def print_context_venv() -> str:
         """Print the Airflow context in venv."""
         from pprint import pprint
 
-        from airflow.operators.python import get_current_context
+        from airflow.providers.standard.operators.python import get_current_context
 
         context = get_current_context()
         pprint(context)
@@ -74,7 +78,7 @@ def print_context_external() -> str:
         """Print the Airflow context in external python."""
         from pprint import pprint
 
-        from airflow.operators.python import get_current_context
+        from airflow.providers.standard.operators.python import get_current_context
 
         context = get_current_context()
         pprint(context)

diff --git a/airflow/example_dags/example_python_decorator.py b/airflow/example_dags/example_python_decorator.py
@@ -30,7 +30,7 @@
 import pendulum
 
 from airflow.decorators import dag, task
-from airflow.operators.python import is_venv_installed
+from airflow.providers.standard.operators.python import is_venv_installed
 
 log = logging.getLogger(__name__)
 

diff --git a/airflow/example_dags/example_python_operator.py b/airflow/example_dags/example_python_operator.py
@@ -30,7 +30,7 @@
 import pendulum
 
 from airflow.models.dag import DAG
-from airflow.operators.python import (
+from airflow.providers.standard.operators.python import (
     ExternalPythonOperator,
     PythonOperator,
     PythonVirtualenvOperator,

diff --git a/airflow/example_dags/example_sensors.py b/airflow/example_dags/example_sensors.py
@@ -24,11 +24,11 @@
 from airflow.models.dag import DAG
 from airflow.providers.standard.operators.bash import BashOperator
 from airflow.providers.standard.sensors.bash import BashSensor
+from airflow.providers.standard.sensors.python import PythonSensor
 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.filesystem import FileSensor
-from airflow.sensors.python import PythonSensor
 from airflow.utils.trigger_rule import TriggerRule
 from airflow.utils.weekday import WeekDay
 

diff --git a/airflow/example_dags/example_short_circuit_operator.py b/airflow/example_dags/example_short_circuit_operator.py
@@ -24,7 +24,7 @@
 from airflow.models.baseoperator import chain
 from airflow.models.dag import DAG
 from airflow.operators.empty import EmptyOperator
-from airflow.operators.python import ShortCircuitOperator
+from airflow.providers.standard.operators.python import ShortCircuitOperator
 from airflow.utils.trigger_rule import TriggerRule
 
 with DAG(

diff --git a/airflow/example_dags/tutorial_dag.py b/airflow/example_dags/tutorial_dag.py
@@ -33,7 +33,7 @@
 from airflow.models.dag import DAG
 
 # Operators; we need this to operate!
-from airflow.operators.python import PythonOperator
+from airflow.providers.standard.operators.python import PythonOperator
 
 # [END import_module]
 

diff --git a/airflow/example_dags/tutorial_taskflow_api_virtualenv.py b/airflow/example_dags/tutorial_taskflow_api_virtualenv.py
@@ -21,7 +21,7 @@
 from datetime import datetime
 
 from airflow.decorators import dag, task
-from airflow.operators.python import is_venv_installed
+from airflow.providers.standard.operators.python import is_venv_installed
 
 log = logging.getLogger(__name__)
 

diff --git a/airflow/example_dags/tutorial_taskflow_templates.py b/airflow/example_dags/tutorial_taskflow_templates.py
@@ -22,7 +22,7 @@
 import pendulum
 
 from airflow.decorators import dag, task
-from airflow.operators.python import get_current_context
+from airflow.providers.standard.operators.python import get_current_context
 
 # [END import_module]
 

@@ -135,10 +135,10 @@ def get_excluded_provider_args(python_version: str) -> list[str]:
     "Always": ["tests/always"],
     "API": ["tests/api", "tests/api_connexion", "tests/api_internal", "tests/api_fastapi"],
     "BranchPythonVenv": [
-        "tests/operators/test_python.py::TestBranchPythonVirtualenvOperator",
+        "providers/tests/standard/operators/test_python.py::TestBranchPythonVirtualenvOperator",
     ],
     "BranchExternalPython": [
-        "tests/operators/test_python.py::TestBranchExternalPythonOperator",
+        "providers/tests/standard/operators/test_python.py::TestBranchExternalPythonOperator",
     ],
     "CLI": ["tests/cli"],
     "Core": [
@@ -150,20 +150,20 @@ def get_excluded_provider_args(python_version: str) -> list[str]:
         "tests/utils",
     ],
     "ExternalPython": [
-        "tests/operators/test_python.py::TestExternalPythonOperator",
+        "providers/tests/standard/operators/test_python.py::TestExternalPythonOperator",
     ],
     "Integration": ["tests/integration"],
     # Operators test type excludes Virtualenv/External tests - they have their own test types
     "Operators": ["tests/operators", "--exclude-virtualenv-operator", "--exclude-external-python-operator"],
     # this one is mysteriously failing dill serialization. It could be removed once
     # https://github.com/pytest-dev/pytest/issues/10845 is fixed
     "PlainAsserts": [
-        "tests/operators/test_python.py::TestPythonVirtualenvOperator::test_airflow_context",
+        "providers/tests/standard/operators/test_python.py::TestPythonVirtualenvOperator::test_airflow_context",
         "--assert=plain",
     ],
     "Providers": ["providers/tests"],
     "PythonVenv": [
-        "tests/operators/test_python.py::TestPythonVirtualenvOperator",
+        "providers/tests/standard/operators/test_python.py::TestPythonVirtualenvOperator",
     ],
     "Serialization": [
         "tests/serialization",

@@ -276,8 +276,8 @@ def __hash__(self):
 )
 
 PYTHON_OPERATOR_FILES = [
-    r"^airflow/operators/python.py",
-    r"^tests/operators/test_python.py",
+    r"^providers/src/providers/standard/operators/python.py",
+    r"^providers/tests/standard/operators/test_python.py",
 ]
 
 TEST_TYPE_MATCHES = HashableDict(

@@ -110,7 +110,7 @@
         (
             "PlainAsserts",
             [
-                "tests/operators/test_python.py::TestPythonVirtualenvOperator::test_airflow_context",
+                "providers/tests/standard/operators/test_python.py::TestPythonVirtualenvOperator::test_airflow_context",
                 "--assert=plain",
             ],
             False,
@@ -123,28 +123,28 @@
         (
             "PythonVenv",
             [
-                "tests/operators/test_python.py::TestPythonVirtualenvOperator",
+                "providers/tests/standard/operators/test_python.py::TestPythonVirtualenvOperator",
             ],
             False,
         ),
         (
             "BranchPythonVenv",
             [
-                "tests/operators/test_python.py::TestBranchPythonVirtualenvOperator",
+                "providers/tests/standard/operators/test_python.py::TestBranchPythonVirtualenvOperator",
             ],
             False,
         ),
         (
             "ExternalPython",
             [
-                "tests/operators/test_python.py::TestExternalPythonOperator",
+                "providers/tests/standard/operators/test_python.py::TestExternalPythonOperator",
             ],
             False,
         ),
         (
             "BranchExternalPython",
             [
-                "tests/operators/test_python.py::TestBranchExternalPythonOperator",
+                "providers/tests/standard/operators/test_python.py::TestBranchExternalPythonOperator",
             ],
             False,
         ),