scmrepo 3.3.8__tar.gz → 3.3.10__tar.gz

{scmrepo-3.3.8 → scmrepo-3.3.10}/.github/workflows/tests.yaml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, windows-latest, macos-latest]
-        pyv: ['3.9', '3.10', '3.11', '3.12']
+        pyv: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - name: Check out the repository
@@ -47,7 +47,7 @@ jobs:
       run: nox -s tests-${{ matrix.pyv }} -- --slow --cov-report=xml
 
     - name: Upload coverage report
-      uses: codecov/codecov-action@v3.1.0
+      uses: codecov/codecov-action@v5.3.1
 
     - name: Build package
       run: nox -s build

{scmrepo-3.3.8 → scmrepo-3.3.10}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -20,13 +20,13 @@ repos:
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.6.7'
+    rev: 'v0.9.3'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.0
     hooks:
       - id: codespell
         additional_dependencies: ["tomli"]

{scmrepo-3.3.8/src/scmrepo.egg-info → scmrepo-3.3.10}/PKG-INFO

@@ -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,6 +11,7 @@ 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
@@ -37,7 +38,7 @@ 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.11.2; 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"

{scmrepo-3.3.8 → scmrepo-3.3.10}/noxfile.py

@@ -10,7 +10,7 @@ nox.options.sessions = "lint", "tests"
 locations = "src", "tests"
 
 
-@nox.session(python=["3.9", "3.10", "3.11", "3.12"])
+@nox.session(python=["3.9", "3.10", "3.11", "3.12", "3.13"])
 def tests(session: nox.Session) -> None:
     session.install(".[tests]")
     session.run(

{scmrepo-3.3.8 → scmrepo-3.3.10}/pyproject.toml

@@ -16,6 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Development Status :: 4 - Beta",
 ]
 requires-python = ">=3.9"
@@ -51,7 +52,7 @@ tests = [
     "proxy.py",
 ]
 dev = [
-    "mypy==1.11.2",
+    "mypy==1.14.1",
     "scmrepo[tests]",
     "types-certifi",
     "types-mock",

{scmrepo-3.3.8 → scmrepo-3.3.10}/src/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-3.3.8 → scmrepo-3.3.10}/src/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-3.3.8 → scmrepo-3.3.10}/src/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-3.3.8 → scmrepo-3.3.10}/src/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-3.3.8 → scmrepo-3.3.10}/src/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-3.3.8 → scmrepo-3.3.10}/src/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-3.3.8 → scmrepo-3.3.10}/src/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-3.3.8 → scmrepo-3.3.10}/src/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-3.3.8 → scmrepo-3.3.10}/src/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 → scmrepo-3.3.10/src/scmrepo.egg-info}/PKG-INFO

@@ -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,6 +11,7 @@ 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
@@ -37,7 +38,7 @@ 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.11.2; 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"

{scmrepo-3.3.8 → scmrepo-3.3.10}/src/scmrepo.egg-info/requires.txt

@@ -10,7 +10,7 @@ aiohttp-retry>=2.5.0
 tqdm
 
 [dev]
-mypy==1.11.2
+mypy==1.14.1
 scmrepo[tests]
 types-certifi
 types-mock

{scmrepo-3.3.8 → scmrepo-3.3.10}/tests/conftest.py

@@ -58,7 +58,7 @@ email=dvctester@example.com
 defaultBranch=master
 """
     (home_dir / ".gitconfig").write_bytes(contents)
-    pygit2.settings.search_path[pygit2.GIT_CONFIG_LEVEL_GLOBAL] = str(home_dir)
+    pygit2.settings.search_path[pygit2.GIT_CONFIG_LEVEL_GLOBAL] = str(home_dir)  # type: ignore[attr-defined]
 
 
 @pytest.fixture

{scmrepo-3.3.8 → scmrepo-3.3.10}/tests/test_credentials.py

@@ -1,5 +1,6 @@
 import io
 import os
+import random
 
 import pytest
 
@@ -45,6 +46,45 @@ def test_subprocess_get_use_http_path(git_helper, mocker):
     assert creds == Credential(username="foo", password="bar")
 
 
+def test_subprocess_ignore_unexpected_credential_keys(git_helper, mocker):
+    git_helper.use_http_path = True
+    run = mocker.patch(
+        "subprocess.run",
+        # Simulate git-credential-osxkeychain (version >=2.45)
+        return_value=mocker.Mock(
+            stdout="username=foo\npassword=bar\ncapability[]=state\nstate[]=osxkeychain:seen=1"
+        ),
+    )
+    creds = git_helper.get(Credential(protocol="https", host="foo.com", path="foo.git"))
+    assert run.call_args.args[0] == ["git-credential-foo", "get"]
+    assert (
+        run.call_args.kwargs.get("input")
+        == "protocol=https\nhost=foo.com\npath=foo.git\n"
+    )
+    assert creds == Credential(username="foo", password="bar")
+
+
+def test_subprocess_strip_trailing_garbage_bytes(git_helper, mocker):
+    """Garbage 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"""
+    git_helper.use_http_path = True
+    run = mocker.patch(
+        "subprocess.run",
+        # Simulate git-credential-osxkeychain (version 2.45), assuming initial 0-byte
+        return_value=mocker.Mock(
+            stdout=f"username=foo\npassword=bar{chr(0)}{random.randbytes(15)}"
+        ),
+    )
+    creds = git_helper.get(Credential(protocol="https", host="foo.com", path="foo.git"))
+    assert run.call_args.args[0] == ["git-credential-foo", "get"]
+    assert (
+        run.call_args.kwargs.get("input")
+        == "protocol=https\nhost=foo.com\npath=foo.git\n"
+    )
+    assert creds == Credential(username="foo", password="bar")
+
+
 def test_subprocess_get_failed(git_helper, mocker):
     from subprocess import CalledProcessError
 

{scmrepo-3.3.8 → scmrepo-3.3.10}/tests/test_lfs.py

@@ -32,7 +32,7 @@ def storage(tmp_dir_factory: TempDirFactory) -> LFSStorage:
 
 
 @pytest.fixture
-def lfs(tmp_dir: TmpDir, scm: Git) -> None:  # noqa: PT004
+def lfs(tmp_dir: TmpDir, scm: Git) -> None:
     tmp_dir.gen(".gitattributes", "*.lfs filter=lfs diff=lfs merge=lfs -text")
     scm.add([".gitattributes"])
     scm.commit("init lfs attributes")

{scmrepo-3.3.8 → scmrepo-3.3.10}/tests/test_pygit2.py

@@ -39,7 +39,7 @@ def test_pygit_resolve_refish(tmp_dir: TmpDir, scm: Git, use_sha: str):
 def test_pygit_stash_apply_conflicts(
     tmp_dir: TmpDir, scm: Git, skip_conflicts: bool, mocker: MockerFixture
 ):
-    from pygit2 import GIT_CHECKOUT_ALLOW_CONFLICTS
+    from pygit2 import GIT_CHECKOUT_ALLOW_CONFLICTS  # type: ignore[attr-defined]
 
     tmp_dir.gen("foo", "foo")
     scm.add_commit("foo", message="foo")