scmrepo 3.3.8__py3-none-any.whl → 3.3.10__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/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

@@ -720,7 +720,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/filter.py

@@ -2,10 +2,10 @@ import io
 import logging
 from typing import TYPE_CHECKING, Callable, Optional
 
-from pygit2 import GIT_FILTER_CLEAN, Filter, Passthrough
+from pygit2 import GIT_FILTER_CLEAN, Filter, Passthrough  # type: ignore[attr-defined]
 
 if TYPE_CHECKING:
-    from pygit2 import FilterSource
+    from pygit2 import FilterSource  # type: ignore[attr-defined]
 
 logger = logging.getLogger(__name__)
 
@@ -17,7 +17,7 @@ class LFSFilter(Filter):
         self._smudge_buf: Optional[io.BytesIO] = None
         self._smudge_root: Optional[str] = None
 
-    def check(self, src: "FilterSource", attr_values: list[str]):
+    def check(self, src: "FilterSource", attr_values: list[Optional[str]]):
         if attr_values[0] == "lfs" and src.mode != GIT_FILTER_CLEAN:
             self._smudge_buf = io.BytesIO()
             self._smudge_root = src.repo.workdir or src.repo.path

scmrepo/git/credentials.py

@@ -173,11 +173,29 @@ class GitCredentialHelper(CredentialHelper):
         if res.stderr:
             logger.debug(res.stderr)
 
-        credentials = {}
+        credentials: dict[str, Any] = {}
         for line in res.stdout.splitlines():
             try:
                 key, value = line.split("=", maxsplit=1)
-                credentials[key] = value
+                # Only include credential values that are used in the Credential
+                # constructor.
+                # Other values may be returned by the subprocess, but they must be
+                # ignored.
+                # e.g. osxkeychain credential helper >= 2.46.0 can return
+                # `capability[]` and `state`)
+                if key in [
+                    "protocol",
+                    "host",
+                    "path",
+                    "username",
+                    "password",
+                    "password_expiry_utc",
+                    "url",
+                ]:
+                    # Garbage bytes were output from git-credential-osxkeychain from
+                    # 2.45.0 to 2.47.0:
+                    # https://github.com/git/git/commit/6c3c451fb6e1c3ca83f74e63079d4d0af01b2d69
+                    credentials[key] = _strip_garbage_bytes(value)
             except ValueError:
                 continue
         if not credentials:
@@ -265,6 +283,19 @@ class GitCredentialHelper(CredentialHelper):
                 )
 
 
+def _strip_garbage_bytes(s: str) -> str:
+    """
+    Garbage (random) bytes were output from git-credential-osxkeychain from
+    2.45.0 to 2.47.0 so must be removed.
+    https://github.com/git/git/commit/6c3c451fb6e1c3ca83f74e63079d4d0af01b2d69
+    :param s: string that might contain garbage/random bytes
+    :return str: The string with the garbage bytes removed
+    """
+    # Assume that any garbage bytes begin with a 0-byte
+    zero = s.find(chr(0))
+    return s[0:zero] if zero >= 0 else s
+
+
 class _CredentialKey(NamedTuple):
     protocol: str
     host: Optional[str]
@@ -293,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/client.py

@@ -281,7 +281,7 @@ def _as_atomic(to_info: str, create_parents: bool = False) -> Iterator[str]:
     if create_parents:
         os.makedirs(parent, exist_ok=True)
 
-    tmp_file = NamedTemporaryFile(dir=parent, delete=False)
+    tmp_file = NamedTemporaryFile(dir=parent, delete=False)  # noqa: SIM115
     tmp_file.close()
     try:
         yield tmp_file.name

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/lfs/storage.py

@@ -47,7 +47,7 @@ class LFSStorage:
         oid = obj if isinstance(obj, str) else obj.oid
         path = self.oid_to_path(oid)
         try:
-            return open(path, **kwargs)  # noqa: SIM115
+            return open(path, **kwargs)
         except FileNotFoundError:
             if not fetch_url or not isinstance(obj, Pointer):
                 raise
@@ -57,7 +57,7 @@ class LFSStorage:
             raise FileNotFoundError(
                 errno.ENOENT, os.strerror(errno.ENOENT), path
             ) from exc
-        return open(path, **kwargs)  # noqa: SIM115
+        return open(path, **kwargs)
 
     def close(self):
         pass

{scmrepo-3.3.8.dist-info → scmrepo-3.3.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: scmrepo
-Version: 3.3.8
+Version: 3.3.10
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
@@ -11,38 +11,39 @@ 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: Programming Language :: Python :: 3.13
 Classifier: Development Status :: 4 - Beta
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: gitpython >3
-Requires-Dist: dulwich >=0.22.1
-Requires-Dist: pygit2 >=1.14.0
-Requires-Dist: pygtrie >=2.3.2
-Requires-Dist: fsspec[tqdm] >=2024.2.0
-Requires-Dist: pathspec >=0.9.0
-Requires-Dist: asyncssh <3,>=2.13.1
-Requires-Dist: funcy >=1.14
-Requires-Dist: aiohttp-retry >=2.5.0
+Requires-Dist: gitpython>3
+Requires-Dist: dulwich>=0.22.1
+Requires-Dist: pygit2>=1.14.0
+Requires-Dist: pygtrie>=2.3.2
+Requires-Dist: fsspec[tqdm]>=2024.2.0
+Requires-Dist: pathspec>=0.9.0
+Requires-Dist: asyncssh<3,>=2.13.1
+Requires-Dist: funcy>=1.14
+Requires-Dist: aiohttp-retry>=2.5.0
 Requires-Dist: tqdm
-Provides-Extra: dev
-Requires-Dist: mypy ==1.11.2 ; 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'
 Provides-Extra: tests
-Requires-Dist: aioresponses <0.8,>=0.7 ; extra == 'tests'
-Requires-Dist: paramiko <4,>=3.4.0 ; extra == 'tests'
-Requires-Dist: pytest <9,>=7 ; extra == 'tests'
-Requires-Dist: pytest-asyncio <1,>=0.23.2 ; extra == 'tests'
-Requires-Dist: pytest-cov >=4.1.0 ; extra == 'tests'
-Requires-Dist: pytest-docker <4,>=1 ; extra == 'tests'
-Requires-Dist: pytest-mock ; extra == 'tests'
-Requires-Dist: pytest-sugar ; extra == 'tests'
-Requires-Dist: pytest-test-utils <0.2,>=0.1.0 ; extra == 'tests'
-Requires-Dist: proxy.py ; extra == 'tests'
+Requires-Dist: aioresponses<0.8,>=0.7; extra == "tests"
+Requires-Dist: paramiko<4,>=3.4.0; extra == "tests"
+Requires-Dist: pytest<9,>=7; extra == "tests"
+Requires-Dist: pytest-asyncio<1,>=0.23.2; extra == "tests"
+Requires-Dist: pytest-cov>=4.1.0; extra == "tests"
+Requires-Dist: pytest-docker<4,>=1; extra == "tests"
+Requires-Dist: pytest-mock; extra == "tests"
+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.14.1; 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"
 
 scmrepo
 =======

{scmrepo-3.3.8.dist-info → scmrepo-3.3.10.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=duj37Eb3k8SZ5dRIxj8XxB_oGCq2KzEjmeawQccXS_g,20938
+scmrepo/git/credentials.py,sha256=tn8TlyCJUz8HOF7eL6F5Yj4n9vREsFwXrjLU1isi13s,22312
 scmrepo/git/objects.py,sha256=vqeFpUlMFHL9Yv1h3wTA7mbRWHCVC_4KgLy5aAISD2g,4674
 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/client.py,sha256=XjNBfOp0L8M3iPpqcX_4bmXsO7hwrkyqg5wMbZULD-I,2358
-scmrepo/git/backend/pygit2/__init__.py,sha256=Is9OjsiDdUTRBUYrG1qoK5AP6Cjcy2tAk71nsmkzLf4,36316
+scmrepo/git/backend/pygit2/__init__.py,sha256=pj9Naxq38JxjI0Aujknamqy4SV4g0Vy0tYN5kcuRbaU,36317
 scmrepo/git/backend/pygit2/callbacks.py,sha256=BFIFMzUpSC-CtNY50yTqksAusASgidzsQrG-B-Ry2lw,2749
-scmrepo/git/backend/pygit2/filter.py,sha256=2NlWfQ7soXN1H7Es6-LctE74hpj3QKQTlYqXRH83VpM,2128
+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=SLlGFC09YD55nTDQ7MjuKD9alql-eOriyNePZikFaYo,10171
+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=LbHGhSRdORu4Iqzb7Ef-2tA_iJbZykXZFotWRJvyr2Y,2380
-scmrepo-3.3.8.dist-info/LICENSE,sha256=-1jhbPjoIVHR0cEgahL4Zhct75Ff4MzYCR_jOaJDPq8,11340
-scmrepo-3.3.8.dist-info/METADATA,sha256=q9rUtEjpdlfz_PXHIk8CIPmy-xtWOQTwa7wHJ7AG1ZY,4774
-scmrepo-3.3.8.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-scmrepo-3.3.8.dist-info/top_level.txt,sha256=iunjod6w3GogERsAYfLRupnANXnqzX3jbIfbeIQG5cc,8
-scmrepo-3.3.8.dist-info/RECORD,,
+scmrepo/git/lfs/storage.py,sha256=nx_HvHHC1sf15Qgbsj8jEOkdHXkZ8VUEh8QBtt9sLwI,2348
+scmrepo-3.3.10.dist-info/LICENSE,sha256=-1jhbPjoIVHR0cEgahL4Zhct75Ff4MzYCR_jOaJDPq8,11340
+scmrepo-3.3.10.dist-info/METADATA,sha256=gUXgbfV8ouHPqtPHzpNQsJzPZPs5e4_yUwqBbj7ZoTU,4793
+scmrepo-3.3.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+scmrepo-3.3.10.dist-info/top_level.txt,sha256=iunjod6w3GogERsAYfLRupnANXnqzX3jbIfbeIQG5cc,8
+scmrepo-3.3.10.dist-info/RECORD,,

{scmrepo-3.3.8.dist-info → scmrepo-3.3.10.dist-info}/WHEEL

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