scmrepo 3.3.9__py3-none-any.whl → 3.3.11__py3-none-any.whl

scmrepo/fs.py

@@ -3,9 +3,7 @@ import os
 import posixpath
 from typing import TYPE_CHECKING, Any, BinaryIO, Callable, Optional
 
-from fsspec.callbacks import _DEFAULT_CALLBACK
 from fsspec.spec import AbstractFileSystem
-from fsspec.utils import isfilelike
 
 if TYPE_CHECKING:
     from io import BytesIO
@@ -242,32 +240,3 @@ class GitFileSystem(AbstractFileSystem):
             return paths
 
         return [self.info(_path) for _path in paths]
-
-    def get_file(
-        self, rpath, lpath, callback=_DEFAULT_CALLBACK, outfile=None, **kwargs
-    ):
-        # NOTE: temporary workaround while waiting for
-        # https://github.com/fsspec/filesystem_spec/pull/1191
-
-        if isfilelike(lpath):
-            outfile = lpath
-        elif self.isdir(rpath):
-            os.makedirs(lpath, exist_ok=True)
-            return None
-
-        with self.open(rpath, "rb", **kwargs) as f1:
-            if outfile is None:
-                outfile = open(lpath, "wb")  # noqa: SIM115
-
-            try:
-                callback.set_size(getattr(f1, "size", None))
-                data = True
-                while data:
-                    data = f1.read(self.blocksize)
-                    segment_len = outfile.write(data)
-                    if segment_len is None:
-                        segment_len = len(data)
-                    callback.relative_update(segment_len)
-            finally:
-                if not isfilelike(lpath):
-                    outfile.close()

scmrepo/git/__init__.py

@@ -258,7 +258,7 @@ class Git(Base):
         self.hooks_dir.mkdir(exist_ok=True)
         hook = self.hooks_dir / name
 
-        directive = f"#!{shutil.which(interpreter) or '/bin/sh' }"
+        directive = f"#!{shutil.which(interpreter) or '/bin/sh'}"
         hook.write_text(f"{directive}\n{script}\n", encoding="utf-8")
         hook.chmod(0o777)
 
@@ -287,7 +287,7 @@ class Git(Base):
     def no_commits(self):
         return not bool(self.get_ref("HEAD"))
 
-    # Prefer re-using the most recently used backend when possible. When
+    # Prefer reusing the most recently used backend when possible. When
     # changing backends (due to unimplemented calls), we close the previous
     # backend to release any open git files/contexts that may cause conflicts
     # with the new backend.

scmrepo/git/backend/dulwich/asyncssh_vendor.py

@@ -2,7 +2,7 @@
 
 import asyncio
 import os
-from collections.abc import Coroutine, Iterator, Sequence
+from collections.abc import Coroutine, Iterator
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -18,6 +18,7 @@ from scmrepo.asyn import BaseAsyncObject, sync_wrapper
 from scmrepo.exceptions import AuthError
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
     from pathlib import Path
 
     from asyncssh.auth import KbdIntPrompts, KbdIntResponse
@@ -40,6 +41,12 @@ async def _read_all(read: Callable[[int], Coroutine], n: Optional[int] = None) -
     return b"".join(result)
 
 
+async def _getpass(*args, **kwargs) -> str:
+    from getpass import getpass
+
+    return await asyncio.to_thread(getpass, *args, **kwargs)
+
+
 class _StderrWrapper:
     def __init__(self, stderr: "SSHReader", loop: asyncio.AbstractEventLoop) -> None:
         self.stderr = stderr
@@ -97,45 +104,6 @@ class AsyncSSHWrapper(BaseAsyncObject):
     close = sync_wrapper(_close)
 
 
-# NOTE: Github's SSH server does not strictly comply with the SSH protocol.
-# When validating a public key using the rsa-sha2-256 or rsa-sha2-512
-# signature algorithms, RFC4252 + RFC8332 state that the server should respond
-# with the same algorithm in SSH_MSG_USERAUTH_PK_OK. Github's server always
-# returns "ssh-rsa" rather than the correct sha2 algorithm name (likely for
-# backwards compatibility with old SSH client reasons). This behavior causes
-# asyncssh to fail with a key-mismatch error (since asyncssh expects the server
-# to behave properly).
-#
-# See also:
-#   https://www.ietf.org/rfc/rfc4252.txt
-#   https://www.ietf.org/rfc/rfc8332.txt
-def _process_public_key_ok_gh(self, _pkttype, _pktid, packet):
-    from asyncssh.misc import ProtocolError
-
-    algorithm = packet.get_string()
-    key_data = packet.get_string()
-    packet.check_end()
-
-    # pylint: disable=protected-access
-    if (
-        (
-            algorithm == b"ssh-rsa"
-            and self._keypair.algorithm
-            not in (
-                b"ssh-rsa",
-                b"rsa-sha2-256",
-                b"rsa-sha2-512",
-            )
-        )
-        or (algorithm not in (b"ssh-rsa", self._keypair.algorithm))
-        or key_data != self._keypair.public_data
-    ):
-        raise ProtocolError("Key mismatch")
-
-    self.create_task(self._send_signed_request())
-    return True
-
-
 class InteractiveSSHClient(SSHClient):
     _conn: Optional["SSHClientConnection"] = None
     _keys_to_try: Optional[list["FilePath"]] = None
@@ -171,7 +139,7 @@ class InteractiveSSHClient(SSHClient):
             self._keys_to_try = []
             options = self._conn._options  # pylint: disable=protected-access
             config = options.config
-            client_keys = cast(Sequence["FilePath"], config.get("IdentityFile", ()))
+            client_keys = cast("Sequence[FilePath]", config.get("IdentityFile", ()))
             if not client_keys:
                 client_keys = [
                     os.path.expanduser(os.path.join("~", ".ssh", path))
@@ -202,8 +170,6 @@ class InteractiveSSHClient(SSHClient):
         return None
 
     async def _read_private_key_interactive(self, path: "FilePath") -> "SSHKey":
-        from getpass import getpass
-
         from asyncssh.public_key import (
             KeyEncryptionError,
             KeyImportError,
@@ -215,11 +181,8 @@ class InteractiveSSHClient(SSHClient):
         if passphrase:
             return read_private_key(path, passphrase=passphrase)
 
-        loop = asyncio.get_running_loop()
         for _ in range(3):
-            passphrase = await loop.run_in_executor(
-                None, getpass, f"Enter passphrase for key '{path}': "
-            )
+            passphrase = await _getpass(f"Enter passphrase for key {path!r}: ")
             if passphrase:
                 try:
                     key = read_private_key(path, passphrase=passphrase)
@@ -239,23 +202,20 @@ class InteractiveSSHClient(SSHClient):
         lang: str,
         prompts: "KbdIntPrompts",
     ) -> Optional["KbdIntResponse"]:
-        from getpass import getpass
-
         if os.environ.get("GIT_TERMINAL_PROMPT") == "0":
             return None
 
-        def _getpass(prompt: str) -> str:
-            return getpass(prompt=prompt).rstrip()
-
         if instructions:
             pass
-        loop = asyncio.get_running_loop()
-        return [
-            await loop.run_in_executor(
-                None, _getpass, f"({name}) {prompt}" if name else prompt
-            )
-            for prompt, _ in prompts
-        ]
+
+        response: list[str] = []
+        for prompt, _echo in prompts:
+            p = await _getpass(f"({name}) {prompt}" if name else prompt)
+            response.append(p.rstrip())
+        return response
+
+    async def password_auth_requested(self) -> str:
+        return await _getpass()
 
 
 class AsyncSSHVendor(BaseAsyncObject, SSHVendor):
@@ -286,12 +246,6 @@ class AsyncSSHVendor(BaseAsyncObject, SSHVendor):
           key_filename: Optional path to private keyfile
         """
         import asyncssh
-        from asyncssh.auth import MSG_USERAUTH_PK_OK, _ClientPublicKeyAuth
-
-        # pylint: disable=protected-access
-        _ClientPublicKeyAuth._packet_handlers[MSG_USERAUTH_PK_OK] = (
-            _process_public_key_ok_gh
-        )
 
         try:
             conn = await asyncssh.connect(

scmrepo/git/backend/gitpython.py

@@ -184,7 +184,7 @@ class GitPythonBackend(BaseGitBackend):  # pylint:disable=abstract-method
             # In fix_env, we delete LD_LIBRARY_PATH key if it was empty before
             # PyInstaller modified it. GitPython, in git.Repo.clone_from, uses
             # env to update its own internal state. When there is no key in
-            # env, this value is not updated and GitPython re-uses
+            # env, this value is not updated and GitPython reuses
             # LD_LIBRARY_PATH that has been set by PyInstaller.
             # See [1] for more info.
             # [1] https://github.com/gitpython-developers/GitPython/issues/924

scmrepo/git/backend/pygit2/__init__.py

@@ -289,7 +289,9 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
             bare = True
         try:
             with RemoteCallbacks(progress=progress) as cb:
-                repo = clone_repository(url, to_path, callbacks=cb, bare=bare)
+                repo = clone_repository(
+                    url, os.fspath(to_path), callbacks=cb, bare=bare
+                )
                 if mirror:
                     cls._set_mirror(repo, progress=progress)
         except GitError as exc:
@@ -720,7 +722,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                     for refname in remote_refs:
                         if fnmatch.fnmatch(refname, lh):
                             src = refname
-                            dst = f"{rh_prefix}{refname[len(lh_prefix):]}"
+                            dst = f"{rh_prefix}{refname[len(lh_prefix) :]}"
                             result[dst] = cb.result.get(
                                 src, _default_status(src, dst, remote_refs)
                             )

scmrepo/git/backend/pygit2/callbacks.py

@@ -66,6 +66,8 @@ class RemoteCallbacks(_RemoteCallbacks, AbstractContextManager):
                 else:
                     creds = Credential(username=username_from_url, url=url).fill()
                     self._store_credentials = creds
+                assert creds.username is not None
+                assert creds.password is not None
                 return UserPass(creds.username, creds.password)
             except CredentialNotFoundError:
                 pass

scmrepo/git/credentials.py

@@ -324,7 +324,7 @@ def _input_tty(prompt: str = "Username: ") -> str:
         try:
             fd = os.open(
                 "/dev/tty",
-                os.O_RDWR | os.O_NOCTTY,  # pylint: disable=no-member
+                os.O_RDWR | os.O_NOCTTY,  # type: ignore[attr-defined]
             )
             tty = io.FileIO(fd, "w+")
             stack.enter_context(tty)

scmrepo/git/lfs/fetch.py

@@ -122,7 +122,7 @@ def _collect_objects(
         and (result := _ROOT_PATH_PREFIX_REGEX.match(path := include[0]))
     ):
         root = result.group("prefix")
-        if path in {root, f'{root.rstrip("/")}/**'}:
+        if path in {root, f"{root.rstrip('/')}/**"}:
             include = []
     else:
         root = "/"

scmrepo/git/objects.py

@@ -160,7 +160,7 @@ class GitTrie:
             }
         )
 
-        return cast(dict, ret)
+        return cast("dict", ret)
 
 
 @dataclass

{scmrepo-3.3.9.dist-info → scmrepo-3.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scmrepo
-Version: 3.3.9
+Version: 3.3.11
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
@@ -38,12 +38,13 @@ Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-test-utils<0.2,>=0.1.0; extra == "tests"
 Requires-Dist: proxy.py; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: mypy==1.13.0; extra == "dev"
+Requires-Dist: mypy==1.15.0; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"
 Requires-Dist: types-paramiko; extra == "dev"
 Requires-Dist: types-tqdm; extra == "dev"
+Dynamic: license-file
 
 scmrepo
 =======

{scmrepo-3.3.9.dist-info → scmrepo-3.3.11.dist-info}/RECORD

@@ -2,37 +2,37 @@ scmrepo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scmrepo/asyn.py,sha256=eckXZkVngwbNNyO04eAJUZxsTy7kvsdz0TUGaWpJpf0,1524
 scmrepo/base.py,sha256=pgddGR7UeZoEq2d5lip1vjbxTmpwTnKFH4JwHy-Fmho,3007
 scmrepo/exceptions.py,sha256=vR8BuCKgKh9lMnCemzNYGHiJctioOmhn_Kv5m8XO69Y,1053
-scmrepo/fs.py,sha256=ARD8_TRSdHpuiaYwF7QXrQIyfl9AFj7ctv_Ltc6pAAs,7740
+scmrepo/fs.py,sha256=8efNf_D5IQb-N42w-apAkG3Uwe8gJA_HVflniY9gX6M,6639
 scmrepo/noscm.py,sha256=xraqlBek4zhFlHf1LvTMkgBM0hykgcTfMVkTNCpVlcQ,491
 scmrepo/progress.py,sha256=fRUMvkcw6GLuVTP_tK7mGpKeJjbJulFP8rPUqyltkYQ,2157
 scmrepo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scmrepo/urls.py,sha256=vEfW1h1lb7GXvMVBk-TNwqctpl-5xGMA2LbOPVn7t4Q,638
 scmrepo/utils.py,sha256=_F3rVvPhES-A2JxLGob0RV8BOnHzxbA9aDPClA7_V8M,1512
-scmrepo/git/__init__.py,sha256=6giWgQpgAlJslOkFmSAYkw8pb7nuefrbpZZf5Np3Iyo,17189
+scmrepo/git/__init__.py,sha256=elQErQSqekg-XWfxjNmEV0X00xtvy0LDFvy9nmv71Ls,17187
 scmrepo/git/config.py,sha256=0t0OBmJ9SIa5tf22QdcGzhZfdMzzppvEmceUDg8ZPyE,943
-scmrepo/git/credentials.py,sha256=VYk16-KHHD_JMVEeVsWI1ZKp8DUaGi8_GDxB-Fjby6g,22311
-scmrepo/git/objects.py,sha256=vqeFpUlMFHL9Yv1h3wTA7mbRWHCVC_4KgLy5aAISD2g,4674
+scmrepo/git/credentials.py,sha256=tn8TlyCJUz8HOF7eL6F5Yj4n9vREsFwXrjLU1isi13s,22312
+scmrepo/git/objects.py,sha256=qx8zAHZIrr0SDbZGD9wVShlMZK57nef8stIeRVqYdCU,4676
 scmrepo/git/stash.py,sha256=wKWnYj_xpdT_3pvHiXtE7_I_By4S-Zbxf4Lv-ZY2sxI,2785
 scmrepo/git/backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scmrepo/git/backend/base.py,sha256=nVMkUIeSVu-ZLCd2QPxMfTgrjnTOejM1UET9R7qKJRc,13560
-scmrepo/git/backend/gitpython.py,sha256=k2MHg1sHZRFNzfQir3IlTpxrQHieflKwwHtnjzlPXZU,25341
+scmrepo/git/backend/gitpython.py,sha256=myfZY2x27DbDvIBUXzDjswXEViR5MKH0qgowwzcn7aY,25340
 scmrepo/git/backend/dulwich/__init__.py,sha256=7UJJyEPqgc2tfPs1WN_XdvRkMsGyFA1HVgTf7mrgLNE,35098
-scmrepo/git/backend/dulwich/asyncssh_vendor.py,sha256=clqsPC9ayulwgb5VLp-69hEbN9XMPvjh_0diBlH4wv4,11520
+scmrepo/git/backend/dulwich/asyncssh_vendor.py,sha256=E3AyXok4S4FwsG9cMdswklf1bYRMmcmQM7Unri2fSVo,9882
 scmrepo/git/backend/dulwich/client.py,sha256=XjNBfOp0L8M3iPpqcX_4bmXsO7hwrkyqg5wMbZULD-I,2358
-scmrepo/git/backend/pygit2/__init__.py,sha256=Is9OjsiDdUTRBUYrG1qoK5AP6Cjcy2tAk71nsmkzLf4,36316
-scmrepo/git/backend/pygit2/callbacks.py,sha256=BFIFMzUpSC-CtNY50yTqksAusASgidzsQrG-B-Ry2lw,2749
+scmrepo/git/backend/pygit2/__init__.py,sha256=7meRePoB_bUx0UY2wPm2nxI4DFabn5nenVP8Cyf7AZc,36366
+scmrepo/git/backend/pygit2/callbacks.py,sha256=Mk-2e5dfJPNLsczRiK4rTnjHd5ZyonmegdwiFwM9Anc,2849
 scmrepo/git/backend/pygit2/filter.py,sha256=8Ibn_2oXM32YRpyovxGKYhtPZLUYTBLDi9--bScOP00,2198
 scmrepo/git/lfs/__init__.py,sha256=at5blRIKnKpg_g5dLRDsGWBFi6SbucRlF_DX6aAkGtE,257
 scmrepo/git/lfs/client.py,sha256=64u5lJijUASNJ4H_Eg7aEb8j3z3eluuNUWGnYvfNnvo,10187
 scmrepo/git/lfs/exceptions.py,sha256=cLlImmPXWJJUl44S4xcRBa2T9wYRkWTaKQGwJylwOhA,77
-scmrepo/git/lfs/fetch.py,sha256=45JGAKHAdANShZ9XEVXq0EYuKBgGmlMK2TX8z9Og8wg,5530
+scmrepo/git/lfs/fetch.py,sha256=YynrODVZWYTfnqOmLOBHjXZQ6sf_lnyDuJHttSl3TOU,5530
 scmrepo/git/lfs/object.py,sha256=rAYY_z9EYoHPfbpF1QHwL7ecYgaETPyCl-zBx0E1oIQ,337
 scmrepo/git/lfs/pointer.py,sha256=BcVbtjoOUG9cEzyJSJDeweqehGZvq43P6NNLDYUGYEI,3181
 scmrepo/git/lfs/progress.py,sha256=AcWvygDG0ee__Jec5BlRr58F-lAj3d4Z_j7JbW3OUcI,4733
 scmrepo/git/lfs/smudge.py,sha256=1O_fznptWo4CKXqcJgUoWP6cgWWhvGAZ3d87kasG3cQ,1610
 scmrepo/git/lfs/storage.py,sha256=nx_HvHHC1sf15Qgbsj8jEOkdHXkZ8VUEh8QBtt9sLwI,2348
-scmrepo-3.3.9.dist-info/LICENSE,sha256=-1jhbPjoIVHR0cEgahL4Zhct75Ff4MzYCR_jOaJDPq8,11340
-scmrepo-3.3.9.dist-info/METADATA,sha256=rTixvRBdWMPNf_op8TVliMDccLarhPf4_hTMRaZNMcE,4792
-scmrepo-3.3.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-scmrepo-3.3.9.dist-info/top_level.txt,sha256=iunjod6w3GogERsAYfLRupnANXnqzX3jbIfbeIQG5cc,8
-scmrepo-3.3.9.dist-info/RECORD,,
+scmrepo-3.3.11.dist-info/licenses/LICENSE,sha256=-1jhbPjoIVHR0cEgahL4Zhct75Ff4MzYCR_jOaJDPq8,11340
+scmrepo-3.3.11.dist-info/METADATA,sha256=2edjOxEKBOCfYNiG_cFDExx5Q8P1eXQfrMTAtSlOzZ8,4815
+scmrepo-3.3.11.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+scmrepo-3.3.11.dist-info/top_level.txt,sha256=iunjod6w3GogERsAYfLRupnANXnqzX3jbIfbeIQG5cc,8
+scmrepo-3.3.11.dist-info/RECORD,,

{scmrepo-3.3.9.dist-info → scmrepo-3.3.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (80.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any