apache-airflow-providers-sftp 4.11.1rc1__tar.gz → 5.0.0rc1__tar.gz

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: apache-airflow-providers-sftp
-Version: 4.11.1rc1
+Version: 5.0.0rc1
 Summary: Provider package apache-airflow-providers-sftp for Apache Airflow
 Keywords: airflow-provider,sftp,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
 Maintainer-email: Apache Software Foundation <dev@airflow.apache.org>
-Requires-Python: ~=3.8
+Requires-Python: ~=3.9
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -15,29 +15,26 @@ Classifier: Intended Audience :: System Administrators
 Classifier: Framework :: Apache Airflow
 Classifier: Framework :: Apache Airflow :: Provider
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow-providers-ssh>=2.1.0rc0
-Requires-Dist: apache-airflow>=2.8.0rc0
+Requires-Dist: apache-airflow>=2.9.0rc0
 Requires-Dist: asyncssh>=2.12.0
 Requires-Dist: paramiko>=2.9.0
-Requires-Dist: apache-airflow-providers-common-compat ; extra == "common.compat"
+Requires-Dist: apache-airflow-providers-common-compat ; extra == "common-compat"
 Requires-Dist: apache-airflow-providers-openlineage ; extra == "openlineage"
-Requires-Dist: apache-airflow-providers-ssh ; extra == "ssh"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-sftp/4.11.1/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-sftp/4.11.1
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.0.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.0.0
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
-Project-URL: Twitter, https://twitter.com/ApacheAirflow
+Project-URL: Twitter, https://x.com/ApacheAirflow
 Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
-Provides-Extra: common.compat
+Provides-Extra: common-compat
 Provides-Extra: openlineage
-Provides-Extra: ssh
 
 
 .. Licensed to the Apache Software Foundation (ASF) under one
@@ -83,7 +80,7 @@ Provides-Extra: ssh
 
 Package ``apache-airflow-providers-sftp``
 
-Release: ``4.11.1.rc1``
+Release: ``5.0.0.rc1``
 
 
 `SSH File Transfer Protocol (SFTP) <https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/>`__
@@ -96,7 +93,7 @@ This is a provider package for ``sftp`` provider. All classes for this provider
 are in ``airflow.providers.sftp`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/4.11.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.0.0/>`_.
 
 Installation
 ------------
@@ -105,7 +102,7 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-sftp``
 
-The package supports the following python versions: 3.8,3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.9,3.10,3.11,3.12
 
 Requirements
 ------------
@@ -113,7 +110,7 @@ Requirements
 ================================  ==================
 PIP package                       Version required
 ================================  ==================
-``apache-airflow``                ``>=2.8.0``
+``apache-airflow``                ``>=2.9.0``
 ``apache-airflow-providers-ssh``  ``>=2.1.0``
 ``paramiko``                      ``>=2.9.0``
 ``asyncssh``                      ``>=2.12.0``
@@ -141,4 +138,4 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/4.11.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.0.0/changelog.html>`_.

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/README.rst

@@ -42,7 +42,7 @@
 
 Package ``apache-airflow-providers-sftp``
 
-Release: ``4.11.1.rc1``
+Release: ``5.0.0.rc1``
 
 
 `SSH File Transfer Protocol (SFTP) <https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/>`__
@@ -55,7 +55,7 @@ This is a provider package for ``sftp`` provider. All classes for this provider
 are in ``airflow.providers.sftp`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/4.11.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.0.0/>`_.
 
 Installation
 ------------
@@ -64,7 +64,7 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-sftp``
 
-The package supports the following python versions: 3.8,3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.9,3.10,3.11,3.12
 
 Requirements
 ------------
@@ -72,7 +72,7 @@ Requirements
 ================================  ==================
 PIP package                       Version required
 ================================  ==================
-``apache-airflow``                ``>=2.8.0``
+``apache-airflow``                ``>=2.9.0``
 ``apache-airflow-providers-ssh``  ``>=2.1.0``
 ``paramiko``                      ``>=2.9.0``
 ``asyncssh``                      ``>=2.12.0``
@@ -100,4 +100,4 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/4.11.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.0.0/changelog.html>`_.

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/airflow/providers/sftp/__init__.py

@@ -29,11 +29,11 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "4.11.1"
+__version__ = "5.0.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
-    "2.8.0"
+    "2.9.0"
 ):
     raise RuntimeError(
-        f"The package `apache-airflow-providers-sftp:{__version__}` needs Apache Airflow 2.8.0+"
+        f"The package `apache-airflow-providers-sftp:{__version__}` needs Apache Airflow 2.9.0+"
     )

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/airflow/providers/sftp/decorators/sensors/sftp.py

@@ -17,7 +17,8 @@
 
 from __future__ import annotations
 
-from typing import Callable, Sequence
+from collections.abc import Sequence
+from typing import Callable
 
 from airflow.decorators.base import TaskDecorator, get_unique_task_id, task_decorator_factory
 from airflow.providers.sftp.sensors.sftp import SFTPSensor

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/airflow/providers/sftp/get_provider_info.py

@@ -28,8 +28,9 @@ def get_provider_info():
         "name": "SFTP",
         "description": "`SSH File Transfer Protocol (SFTP) <https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/>`__\n",
         "state": "ready",
-        "source-date-epoch": 1726861127,
+        "source-date-epoch": 1734536539,
         "versions": [
+            "5.0.0",
             "4.11.1",
             "4.11.0",
             "4.10.3",
@@ -72,7 +73,7 @@ def get_provider_info():
             "1.0.0",
         ],
         "dependencies": [
-            "apache-airflow>=2.8.0",
+            "apache-airflow>=2.9.0",
             "apache-airflow-providers-ssh>=2.1.0",
             "paramiko>=2.9.0",
             "asyncssh>=2.12.0",

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/airflow/providers/sftp/hooks/sftp.py

@@ -22,14 +22,14 @@ from __future__ import annotations
 import datetime
 import os
 import stat
-import warnings
+from collections.abc import Sequence
 from fnmatch import fnmatch
-from typing import TYPE_CHECKING, Any, Callable, Sequence
+from typing import TYPE_CHECKING, Any, Callable
 
 import asyncssh
 from asgiref.sync import sync_to_async
 
-from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException
 from airflow.hooks.base import BaseHook
 from airflow.providers.ssh.hooks.ssh import SSHHook
 
@@ -61,7 +61,6 @@ class SFTPHook(SSHHook):
     For consistency reasons with SSHHook, the preferred parameter is "ssh_conn_id".
 
     :param ssh_conn_id: The :ref:`sftp connection id<howto/connection:sftp>`
-    :param ssh_hook: Optional SSH hook (included to support passing of an SSH hook to the SFTP operator)
     """
 
     conn_name_attr = "ssh_conn_id"
@@ -81,39 +80,14 @@ class SFTPHook(SSHHook):
     def __init__(
         self,
         ssh_conn_id: str | None = "sftp_default",
-        ssh_hook: SSHHook | None = None,
+        host_proxy_cmd: str | None = None,
         *args,
         **kwargs,
     ) -> None:
         self.conn: paramiko.SFTPClient | None = None
 
-        # TODO: remove support for ssh_hook when it is removed from SFTPOperator
-        self.ssh_hook = ssh_hook
-
-        if self.ssh_hook is not None:
-            warnings.warn(
-                "Parameter `ssh_hook` is deprecated and will be removed in a future version.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            if not isinstance(self.ssh_hook, SSHHook):
-                raise AirflowException(
-                    f"ssh_hook must be an instance of SSHHook, but got {type(self.ssh_hook)}"
-                )
-            self.log.info("ssh_hook is provided. It will be used to generate SFTP connection.")
-            self.ssh_conn_id = self.ssh_hook.ssh_conn_id
-            return
-
-        ftp_conn_id = kwargs.pop("ftp_conn_id", None)
-        if ftp_conn_id:
-            warnings.warn(
-                "Parameter `ftp_conn_id` is deprecated. Please use `ssh_conn_id` instead.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            ssh_conn_id = ftp_conn_id
-
         kwargs["ssh_conn_id"] = ssh_conn_id
+        kwargs["host_proxy_cmd"] = host_proxy_cmd
         self.ssh_conn_id = ssh_conn_id
 
         super().__init__(*args, **kwargs)
@@ -121,11 +95,7 @@ class SFTPHook(SSHHook):
     def get_conn(self) -> paramiko.SFTPClient:  # type: ignore[override]
         """Open an SFTP connection to the remote host."""
         if self.conn is None:
-            # TODO: remove support for ssh_hook when it is removed from SFTPOperator
-            if self.ssh_hook is not None:
-                self.conn = self.ssh_hook.get_conn().open_sftp()
-            else:
-                self.conn = super().get_conn().open_sftp()
+            self.conn = super().get_conn().open_sftp()
         return self.conn
 
     def close_conn(self) -> None:
@@ -165,6 +135,15 @@ class SFTPHook(SSHHook):
         files = sorted(conn.listdir(path))
         return files
 
+    def list_directory_with_attr(self, path: str) -> list[paramiko.SFTPAttributes]:
+        """
+        List files in a directory on the remote system including their SFTPAttributes.
+
+        :param path: full path to the remote directory to list
+        """
+        conn = self.get_conn()
+        return [file for file in conn.listdir_attr(path)]
+
     def mkdir(self, path: str, mode: int = 0o777) -> None:
         """
         Create a directory on the remote system.
@@ -341,10 +320,9 @@ class SFTPHook(SSHHook):
             (form: ``func(str)``)
         :param bool recurse: *Default: True* - should it recurse
         """
-        conn = self.get_conn()
-        for entry in self.list_directory(path):
-            pathname = os.path.join(path, entry)
-            mode = conn.stat(pathname).st_mode
+        for entry in self.list_directory_with_attr(path):
+            pathname = os.path.join(path, entry.filename)
+            mode = entry.st_mode
             if stat.S_ISDIR(mode):  # type: ignore
                 # It's a directory, call the dcallback function
                 dcallback(pathname)
@@ -420,9 +398,9 @@ class SFTPHook(SSHHook):
         :return: list of string containing the found files, or an empty list if none matched
         """
         matched_files = []
-        for file in self.list_directory(path):
-            if fnmatch(file, fnmatch_pattern):
-                matched_files.append(file)
+        for file in self.list_directory_with_attr(path):
+            if fnmatch(file.filename, fnmatch_pattern):
+                matched_files.append(file.filename)
 
         return matched_files
 

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/airflow/providers/sftp/operators/sftp.py

@@ -21,16 +21,15 @@ from __future__ import annotations
 
 import os
 import socket
-import warnings
+from collections.abc import Sequence
 from pathlib import Path
-from typing import Any, Sequence
+from typing import Any
 
 import paramiko
 
-from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException
 from airflow.models import BaseOperator
 from airflow.providers.sftp.hooks.sftp import SFTPHook
-from airflow.providers.ssh.hooks.ssh import SSHHook
 
 
 class SFTPOperation:
@@ -47,15 +46,12 @@ class SFTPOperator(BaseOperator):
     This operator uses sftp_hook to open sftp transport channel that serve as basis for file transfer.
 
     :param ssh_conn_id: :ref:`ssh connection id<howto/connection:ssh>`
-        from airflow Connections. `ssh_conn_id` will be ignored if `ssh_hook`
-        or `sftp_hook` is provided.
+        from airflow Connections.
     :param sftp_hook: predefined SFTPHook to use
         Either `sftp_hook` or `ssh_conn_id` needs to be provided.
-    :param ssh_hook: Deprecated - predefined SSHHook to use for remote execution
-        Use `sftp_hook` instead.
     :param remote_host: remote host to connect (templated)
         Nullable. If provided, it will replace the `remote_host` which was
-        defined in `sftp_hook`/`ssh_hook` or predefined in the connection of `ssh_conn_id`.
+        defined in `sftp_hook` or predefined in the connection of `ssh_conn_id`.
     :param local_filepath: local file path or list of local file paths to get or put. (templated)
     :param remote_filepath: remote file path or list of remote file paths to get or put. (templated)
     :param operation: specify operation 'get' or 'put', defaults to put
@@ -85,7 +81,6 @@ class SFTPOperator(BaseOperator):
     def __init__(
         self,
         *,
-        ssh_hook: SSHHook | None = None,
         sftp_hook: SFTPHook | None = None,
         ssh_conn_id: str | None = None,
         remote_host: str | None = None,
@@ -97,7 +92,6 @@ class SFTPOperator(BaseOperator):
         **kwargs,
     ) -> None:
         super().__init__(**kwargs)
-        self.ssh_hook = ssh_hook
         self.sftp_hook = sftp_hook
         self.ssh_conn_id = ssh_conn_id
         self.remote_host = remote_host
@@ -130,35 +124,13 @@ class SFTPOperator(BaseOperator):
                 f"expected {SFTPOperation.GET} or {SFTPOperation.PUT}."
             )
 
-        # TODO: remove support for ssh_hook in next major provider version in hook and operator
-        if self.ssh_hook is not None and self.sftp_hook is not None:
-            raise AirflowException(
-                "Both `ssh_hook` and `sftp_hook` are defined. Please use only one of them."
-            )
-
-        if self.ssh_hook is not None:
-            if not isinstance(self.ssh_hook, SSHHook):
-                self.log.info("ssh_hook is invalid. Trying ssh_conn_id to create SFTPHook.")
-                self.sftp_hook = SFTPHook(ssh_conn_id=self.ssh_conn_id)
-            if self.sftp_hook is None:
-                warnings.warn(
-                    "Parameter `ssh_hook` is deprecated. "
-                    "Please use `sftp_hook` instead. "
-                    "The old parameter `ssh_hook` will be removed in a future version.",
-                    AirflowProviderDeprecationWarning,
-                    stacklevel=2,
-                )
-                self.sftp_hook = SFTPHook(ssh_hook=self.ssh_hook)
-
         file_msg = None
         try:
             if self.ssh_conn_id:
                 if self.sftp_hook and isinstance(self.sftp_hook, SFTPHook):
-                    self.log.info("ssh_conn_id is ignored when sftp_hook/ssh_hook is provided.")
+                    self.log.info("ssh_conn_id is ignored when sftp_hook is provided.")
                 else:
-                    self.log.info(
-                        "sftp_hook/ssh_hook not provided or invalid. Trying ssh_conn_id to create SFTPHook."
-                    )
+                    self.log.info("sftp_hook not provided or invalid. Trying ssh_conn_id to create SFTPHook.")
                     self.sftp_hook = SFTPHook(ssh_conn_id=self.ssh_conn_id)
 
             if not self.sftp_hook:
@@ -216,7 +188,7 @@ class SFTPOperator(BaseOperator):
                 exc_info=True,
             )
 
-        hook = self.sftp_hook or self.ssh_hook or SFTPHook(ssh_conn_id=self.ssh_conn_id)
+        hook = self.sftp_hook or SFTPHook(ssh_conn_id=self.ssh_conn_id)
 
         if self.remote_host is not None:
             remote_host = self.remote_host
@@ -234,8 +206,6 @@ class SFTPOperator(BaseOperator):
 
         if hasattr(hook, "port"):
             remote_port = hook.port
-        elif hasattr(hook, "ssh_hook"):
-            remote_port = hook.ssh_hook.port
 
         # Since v4.1.0, SFTPOperator accepts both a string (single file) and a list of
         # strings (multiple files) as local_filepath and remote_filepath, and internally

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/airflow/providers/sftp/sensors/sftp.py

@@ -20,8 +20,9 @@
 from __future__ import annotations
 
 import os
+from collections.abc import Sequence
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, Any, Callable, Sequence
+from typing import TYPE_CHECKING, Any, Callable
 
 from paramiko.sftp import SFTP_NO_SUCH_FILE
 

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/airflow/providers/sftp/triggers/sftp.py

@@ -18,8 +18,9 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import AsyncIterator
 from datetime import datetime
-from typing import Any, AsyncIterator
+from typing import Any
 
 from dateutil.parser import parse as parse_date
 

{apache_airflow_providers_sftp-4.11.1rc1 → apache_airflow_providers_sftp-5.0.0rc1}/pyproject.toml

@@ -21,14 +21,13 @@
 
 # IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
 # `pyproject_TEMPLATE.toml.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
-#
 [build-system]
-requires = ["flit_core >=3.2,<4"]
+requires = ["flit_core==3.10.1"]
 build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-sftp"
-version = "4.11.1.rc1"
+version = "5.0.0.rc1"
 description = "Provider package apache-airflow-providers-sftp for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -47,28 +46,27 @@ classifiers = [
     "Framework :: Apache Airflow",
     "Framework :: Apache Airflow :: Provider",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Topic :: System :: Monitoring",
 ]
-requires-python = "~=3.8"
+requires-python = "~=3.9"
 dependencies = [
     "apache-airflow-providers-ssh>=2.1.0rc0",
-    "apache-airflow>=2.8.0rc0",
+    "apache-airflow>=2.9.0rc0",
     "asyncssh>=2.12.0",
     "paramiko>=2.9.0",
 ]
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/4.11.1"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/4.11.1/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.0.0"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.0.0/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"
-"Twitter" = "https://twitter.com/ApacheAirflow"
+"Twitter" = "https://x.com/ApacheAirflow"
 "YouTube" = "https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/"
 
 [project.entry-points."apache_airflow_provider"]
@@ -80,9 +78,6 @@ provider_info = "airflow.providers.sftp.get_provider_info:get_provider_info"
 "openlineage" = [
     "apache-airflow-providers-openlineage",
 ]
-"ssh" = [
-    "apache-airflow-providers-ssh",
-]
 
 [tool.flit.module]
 name = "airflow.providers.sftp"