Revert "Move FSHook/PackageIndexHook/SubprocessHook to standard provi…

…der (#42…" (#42659)

This reverts commit 61d1dbb.

airflow/providers/standard/hooks/subprocess.py → airflow/hooks/subprocess.py

@@ -52,8 +52,8 @@ def run_command(
         :param env: Optional dict containing environment variables to be made available to the shell
             environment in which ``command`` will be executed.  If omitted, ``os.environ`` will be used.
             Note, that in case you have Sentry configured, original variables from the environment
-            will also be passed to the subprocess with ``SUBPROCESS_`` prefix. See:
-            https://airflow.apache.org/docs/apache-airflow/stable/administration-and-deployment/logging-monitoring/errors.html for details.
+            will also be passed to the subprocess with ``SUBPROCESS_`` prefix. See
+            :doc:`/administration-and-deployment/logging-monitoring/errors` for details.
         :param output_encoding: encoding to use for decoding stdout
         :param cwd: Working directory to run the command in.
             If None (default), the command is run in a temporary directory.

airflow/operators/bash.py

@@ -24,8 +24,8 @@
 from typing import TYPE_CHECKING, Any, Callable, Container, Sequence, cast
 
 from airflow.exceptions import AirflowException, AirflowSkipException
+from airflow.hooks.subprocess import SubprocessHook
 from airflow.models.baseoperator import BaseOperator
-from airflow.providers.standard.hooks.subprocess import SubprocessHook
 from airflow.utils.operator_helpers import context_to_airflow_vars
 from airflow.utils.types import ArgNotSet
 

airflow/providers/standard/provider.yaml

@@ -50,10 +50,3 @@ sensors:
       - airflow.providers.standard.sensors.time_delta
       - airflow.providers.standard.sensors.time
       - airflow.providers.standard.sensors.weekday
-
-hooks:
-  - integration-name: Standard
-    python-modules:
-      - airflow.providers.standard.hooks.filesystem
-      - airflow.providers.standard.hooks.package_index
-      - airflow.providers.standard.hooks.subprocess

airflow/providers_manager.py

@@ -36,8 +36,8 @@
 from packaging.utils import canonicalize_name
 
 from airflow.exceptions import AirflowOptionalProviderFeatureException
-from airflow.providers.standard.hooks.filesystem import FSHook
-from airflow.providers.standard.hooks.package_index import PackageIndexHook
+from airflow.hooks.filesystem import FSHook
+from airflow.hooks.package_index import PackageIndexHook
 from airflow.typing_compat import ParamSpec
 from airflow.utils import yaml
 from airflow.utils.entry_points import entry_points_with_dist

airflow/sensors/filesystem.py

@@ -25,7 +25,7 @@
 
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
-from airflow.providers.standard.hooks.filesystem import FSHook
+from airflow.hooks.filesystem import FSHook
 from airflow.sensors.base import BaseSensorOperator
 from airflow.triggers.base import StartTriggerArgs
 from airflow.triggers.file import FileTrigger

docs/apache-airflow/administration-and-deployment/logging-monitoring/errors.rst

@@ -96,7 +96,7 @@ Impact of Sentry on Environment variables passed to Subprocess Hook
 
 When Sentry is enabled, by default it changes the standard library to pass all environment variables to
 subprocesses opened by Airflow. This changes the default behaviour of
-:class:`airflow.providers.standard.hooks.subprocess.SubprocessHook` - always all environment variables are passed to the
+:class:`airflow.hooks.subprocess.SubprocessHook` - always all environment variables are passed to the
 subprocess executed with specific set of environment variables. In this case not only the specified
 environment variables are passed but also all existing environment variables are passed with
 ``SUBPROCESS_`` prefix added. This happens also for all other subprocesses.

docs/apache-airflow/operators-and-hooks-ref.rst

@@ -106,8 +106,8 @@ For details see: :doc:`apache-airflow-providers:operators-and-hooks-ref/index`.
    * - Hooks
      - Guides
 
-   * - :mod:`airflow.providers.standard.hooks.filesystem`
+   * - :mod:`airflow.hooks.filesystem`
      -
 
-   * - :mod:`airflow.providers.standard.hooks.subprocess`
+   * - :mod:`airflow.hooks.subprocess`
      -

tests/providers/standard/hooks/test_package_index.py → tests/hooks/test_package_index.py

@@ -21,8 +21,8 @@
 
 import pytest
 
+from airflow.hooks.package_index import PackageIndexHook
 from airflow.models.connection import Connection
-from airflow.providers.standard.hooks.package_index import PackageIndexHook
 
 
 class MockConnection(Connection):
@@ -73,7 +73,7 @@ def mock_get_connection(monkeypatch: pytest.MonkeyPatch, request: pytest.Fixture
     password: str | None = testdata.get("password", None)
     expected_result: str | None = testdata.get("expected_result", None)
     monkeypatch.setattr(
-        "airflow.providers.standard.hooks.package_index.PackageIndexHook.get_connection",
+        "airflow.hooks.package_index.PackageIndexHook.get_connection",
         lambda *_: MockConnection(host, login, password),
     )
     return expected_result
@@ -104,7 +104,7 @@ class MockProc:
 
         return MockProc()
 
-    monkeypatch.setattr("airflow.providers.standard.hooks.package_index.subprocess.run", mock_run)
+    monkeypatch.setattr("airflow.hooks.package_index.subprocess.run", mock_run)
 
     hook_instance = PackageIndexHook()
     if mock_get_connection:

tests/providers/standard/hooks/test_subprocess.py → tests/hooks/test_subprocess.py

@@ -26,7 +26,7 @@
 
 import pytest
 
-from airflow.providers.standard.hooks.subprocess import SubprocessHook
+from airflow.hooks.subprocess import SubprocessHook
 
 OS_ENV_KEY = "SUBPROCESS_ENV_TEST"
 OS_ENV_VAL = "this-is-from-os-environ"
@@ -81,11 +81,11 @@ def test_return_value(self, val, expected):
 
     @mock.patch.dict("os.environ", clear=True)
     @mock.patch(
-        "airflow.providers.standard.hooks.subprocess.TemporaryDirectory",
+        "airflow.hooks.subprocess.TemporaryDirectory",
         return_value=MagicMock(__enter__=MagicMock(return_value="/tmp/airflowtmpcatcat")),
     )
     @mock.patch(
-        "airflow.providers.standard.hooks.subprocess.Popen",
+        "airflow.hooks.subprocess.Popen",
         return_value=MagicMock(stdout=MagicMock(readline=MagicMock(side_effect=StopIteration), returncode=0)),
     )
     def test_should_exec_subprocess(self, mock_popen, mock_temporary_directory):

tests/sensors/test_filesystem.py

@@ -40,7 +40,7 @@
 @pytest.mark.skip_if_database_isolation_mode  # Test is broken in db isolation mode
 class TestFileSensor:
     def setup_method(self):
-        from airflow.providers.standard.hooks.filesystem import FSHook
+        from airflow.hooks.filesystem import FSHook
 
         hook = FSHook()
         args = {"owner": "airflow", "start_date": DEFAULT_DATE}