deps: bump dvc-data to 0.1.18

dvc/fs/__init__.py

@@ -1,6 +1,8 @@
 from urllib.parse import urlparse
 
 from dvc_http import HTTPFileSystem, HTTPSFileSystem  # noqa: F401
+from dvc_ssh import DEFAULT_PORT as DEFAULT_SSH_PORT  # noqa: F401
+from dvc_ssh import SSHFileSystem  # noqa: F401
 
 # pylint: disable=unused-import
 from dvc_objects.fs import utils  # noqa: F401
@@ -29,10 +31,6 @@ from dvc_objects.fs.implementations.hdfs import HDFSFileSystem  # noqa: F401
 from dvc_objects.fs.implementations.local import localfs  # noqa: F401
 from dvc_objects.fs.implementations.oss import OSSFileSystem  # noqa: F401
 from dvc_objects.fs.implementations.s3 import S3FileSystem  # noqa: F401
-from dvc_objects.fs.implementations.ssh import (  # noqa: F401
-    DEFAULT_PORT as DEFAULT_SSH_PORT,
-)
-from dvc_objects.fs.implementations.ssh import SSHFileSystem  # noqa: F401
 from dvc_objects.fs.implementations.webdav import (  # noqa: F401
     WebDAVFileSystem,
     WebDAVSFileSystem,

setup.cfg

@@ -68,7 +68,7 @@ install_requires =
     dvc-render==0.0.9
     dvc-task==0.1.2
     dvclive>=0.10.0
-    dvc-data==0.1.17
+    dvc-data==0.1.18
     dvc-http==0.0.2
     hydra-core>=1.1.0
 
@@ -106,11 +106,11 @@ ssh =
     # due to https://github.com/python-poetry/poetry/issues/4683, we have to
     # explicitly specify bcrypt here
     bcrypt
-    sshfs[bcrypt]>=2022.6.0
+    dvc-ssh==0.0.1
 # gssapi should not be included in all_remotes, because it doesn't have wheels
 # for Linux, so it will fail to compile if user doesn't have all the
 # requirements, including kerberos itself.
-ssh_gssapi = sshfs[gssapi]>=2022.6.0
+ssh_gssapi = dvc-ssh[gssapi]==0.0.1
 webdav = webdav4>=0.9.3
 # not to break `dvc[webhdfs]`
 webhdfs =
@@ -119,7 +119,7 @@ webhdfs_kerberos = requests-kerberos==0.14.0
 terraform = tpi[ssh]>=2.1.0
 tests =
     %(terraform)s
-    dvc_ssh==0.0.1a0
+    dvc-ssh==0.0.1
     # Test requirements
     pytest==7.1.2
     pytest-cov==3.0.0

tests/unit/fs/test_ssh.py

@@ -44,9 +44,7 @@ def test_init():
 
 
 def test_ssh_ask_password(mocker):
-    mocker.patch(
-        "dvc_objects.fs.implementations.ssh.ask_password", return_value="fish"
-    )
+    mocker.patch("dvc_ssh.ask_password", return_value="fish")
     fs = SSHFileSystem(user="test", host="2.2.2.2", ask_password=True)
     assert fs.fs_args["password"] == fs.fs_args["passphrase"] == "fish"