scmrepo 3.3.7__tar.gz → 3.3.9__tar.gz

{scmrepo-3.3.7 → scmrepo-3.3.9}/.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

{scmrepo-3.3.7 → scmrepo-3.3.9}/.gitignore

@@ -138,3 +138,4 @@ dmypy.json
 cython_debug/
 
 .DS_Store
+.vscode/

{scmrepo-3.3.7 → scmrepo-3.3.9}/.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,7 +20,7 @@ repos:
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.5.2'
+    rev: 'v0.7.4'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

{scmrepo-3.3.7/src/scmrepo.egg-info → scmrepo-3.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 3.3.7
+Version: 3.3.9
 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
@@ -35,8 +36,9 @@ 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.10.1; extra == "dev"
+Requires-Dist: mypy==1.13.0; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

{scmrepo-3.3.7 → scmrepo-3.3.9}/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.7 → scmrepo-3.3.9}/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"
@@ -48,9 +49,10 @@ tests = [
     "pytest-mock",
     "pytest-sugar",
     "pytest-test-utils>=0.1.0,<0.2",
+    "proxy.py",
 ]
 dev = [
-    "mypy==1.10.1",
+    "mypy==1.13.0",
     "scmrepo[tests]",
     "types-certifi",
     "types-mock",
@@ -73,6 +75,7 @@ markers = [
 ]
 asyncio_mode = "auto"
 
+
 [tool.coverage.run]
 branch = true
 source = ["scmrepo", "tests"]

{scmrepo-3.3.7 → scmrepo-3.3.9}/src/scmrepo/git/backend/dulwich/__init__.py

@@ -16,6 +16,7 @@ from typing import (
     Union,
 )
 
+from dulwich.config import ConfigFile, StackedConfig
 from funcy import cached_property, reraise
 
 from scmrepo.exceptions import AuthError, CloneError, InvalidRemote, RevError, SCMError
@@ -27,7 +28,7 @@ from scmrepo.utils import relpath
 
 if TYPE_CHECKING:
     from dulwich.client import SSHVendor
-    from dulwich.config import ConfigFile, StackedConfig
+    from dulwich.config import ConfigFile
     from dulwich.repo import Repo
 
     from scmrepo.git.objects import GitCommit
@@ -579,7 +580,8 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
 
         try:
             _remote, location = get_remote_repo(self.repo, url)
-            client, path = get_transport_and_path(location, **kwargs)
+            _config = kwargs.pop("config", StackedConfig.default())
+            client, path = get_transport_and_path(location, config=_config, **kwargs)
         except Exception as exc:
             raise InvalidRemote(url) from exc
 
@@ -616,7 +618,8 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
 
         try:
             _remote, location = get_remote_repo(self.repo, url)
-            client, path = get_transport_and_path(location, **kwargs)
+            _config = kwargs.pop("config", StackedConfig.default())
+            client, path = get_transport_and_path(location, config=_config, **kwargs)
         except Exception as exc:
             raise SCMError(f"'{url}' is not a valid Git remote or URL") from exc
 
@@ -723,7 +726,8 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
 
         with reraise(Exception, SCMError(f"'{url}' is not a valid Git remote or URL")):
             _remote, location = get_remote_repo(self.repo, url)
-            client, path = get_transport_and_path(location, **kwargs)
+            _config = kwargs.pop("config", StackedConfig.default())
+            client, path = get_transport_and_path(location, config=_config, **kwargs)
 
         with reraise(
             (NotGitRepository, KeyError),
@@ -909,6 +913,7 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
 
         try:
             _, location = get_remote_repo(self.repo, url)
+            _config = kwargs.pop("config", StackedConfig.default())
             client, path = get_transport_and_path(location, **kwargs)
         except Exception as exc:
             raise InvalidRemote(url) from exc

{scmrepo-3.3.7 → scmrepo-3.3.9}/src/scmrepo/git/backend/pygit2/__init__.py

@@ -701,15 +701,13 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                     remote_refs: dict[str, Oid] = (
                         {
                             head["name"]: head["oid"]
-                            for head in remote.ls_remotes(callbacks=cb)
+                            for head in remote.ls_remotes(callbacks=cb, proxy=True)
                         }
                         if not force
                         else {}
                     )
                     remote.fetch(
-                        refspecs=refspecs,
-                        callbacks=cb,
-                        message="fetch",
+                        refspecs=refspecs, callbacks=cb, message="fetch", proxy=True
                     )
 
             result: dict[str, SyncStatus] = {}

{scmrepo-3.3.7 → scmrepo-3.3.9}/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.7 → scmrepo-3.3.9}/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]

{scmrepo-3.3.7 → scmrepo-3.3.9}/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.7 → scmrepo-3.3.9}/src/scmrepo/git/lfs/progress.py

@@ -32,7 +32,7 @@ class _Tqdm(tqdm):
         "miniters": 1,
     }
 
-    def __init__(  # noqa: PLR0913
+    def __init__(
         self,
         iterable=None,
         disable=None,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 3.3.7
+Version: 3.3.9
 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
@@ -35,8 +36,9 @@ 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.10.1; extra == "dev"
+Requires-Dist: mypy==1.13.0; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

{scmrepo-3.3.7 → scmrepo-3.3.9}/src/scmrepo.egg-info/requires.txt

@@ -10,7 +10,7 @@ aiohttp-retry>=2.5.0
 tqdm
 
 [dev]
-mypy==1.10.1
+mypy==1.13.0
 scmrepo[tests]
 types-certifi
 types-mock
@@ -27,3 +27,4 @@ pytest-docker<4,>=1
 pytest-mock
 pytest-sugar
 pytest-test-utils<0.2,>=0.1.0
+proxy.py

{scmrepo-3.3.7 → scmrepo-3.3.9}/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.7 → scmrepo-3.3.9}/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.7 → scmrepo-3.3.9}/tests/test_git.py

@@ -1,5 +1,6 @@
 import os
 import shutil
+from pathlib import Path
 from typing import Any, Optional
 
 import pytest
@@ -7,14 +8,20 @@ from asyncssh import SFTPClient
 from asyncssh.connection import SSHClientConnection
 from dulwich.client import LocalGitClient
 from git import Repo as GitPythonRepo
+from proxy import TestCase as ProxyTestCase
 from pygit2 import GitError
 from pygit2.remotes import Remote
 from pytest_mock import MockerFixture
 from pytest_test_utils import TempDirFactory, TmpDir
 from pytest_test_utils.matchers import Matcher
 
-from scmrepo.exceptions import InvalidRemote, MergeConflictError, RevError, SCMError
-from scmrepo.git import Git
+from scmrepo.exceptions import (
+    InvalidRemote,
+    MergeConflictError,
+    RevError,
+    SCMError,
+)
+from scmrepo.git import Git, GitBackends
 from scmrepo.git.objects import GitTag
 
 from .conftest import backends
@@ -22,6 +29,13 @@ from .conftest import backends
 # pylint: disable=redefined-outer-name,unused-argument,protected-access
 
 
+BAD_PROXY_CONFIG = """[http]
+proxy = "http://bad-proxy.dvc.org"
+[https]
+proxy = "http://bad-proxy.dvc.org"
+"""
+
+
 @pytest.fixture
 def submodule_dir(tmp_dir: TmpDir, scm: Git):
     scm.commit("init")
@@ -941,6 +955,84 @@ def test_clone(
         assert fobj.read().strip() == "foo"
 
 
+@pytest.fixture
+def proxy_server():
+    class _ProxyServer(ProxyTestCase):
+        pass
+
+    _ProxyServer.setUpClass()
+    yield f"http://{_ProxyServer.PROXY.flags.hostname}:{_ProxyServer.PROXY.flags.port}"
+    _ProxyServer.tearDownClass()
+
+
+def test_clone_proxy_server(proxy_server: str, scm: Git, git: Git, tmp_dir: TmpDir):
+    url = "https://github.com/iterative/dvcyaml-schema"
+
+    p = (
+        Path(os.environ["HOME"] if "HOME" in os.environ else os.environ["USERPROFILE"])
+        / ".gitconfig"
+    )
+    p.write_text(BAD_PROXY_CONFIG)
+    with pytest.raises(Exception):  # noqa: PT011, B017
+        git.clone(url, "dir")
+
+    mock_config_content = f"""[http]\n
+proxy = {proxy_server}
+[https]
+proxy = {proxy_server}
+"""
+
+    p.write_text(mock_config_content)
+    git.clone(url, "dir")
+
+
+def test_iter_remote_refs_proxy_server(proxy_server: str, scm: Git, tmp_dir: TmpDir):
+    url = "https://github.com/iterative/dvcyaml-schema"
+    git = GitBackends.DEFAULT["dulwich"](".")
+
+    p = (
+        Path(os.environ["HOME"] if "HOME" in os.environ else os.environ["USERPROFILE"])
+        / ".gitconfig"
+    )
+    p.write_text(BAD_PROXY_CONFIG)
+    with pytest.raises(Exception):  # noqa: PT011, B017
+        list(git.iter_remote_refs(url))
+
+    mock_config_content = f"""[http]
+proxy = {proxy_server}
+[https]
+proxy = {proxy_server}
+"""
+
+    p.write_text(mock_config_content)
+    res = list(git.iter_remote_refs(url))
+    assert res
+
+
+@pytest.mark.skip_git_backend("gitpython")
+def test_fetch_refspecs_proxy_server(
+    proxy_server: str, scm: Git, git: Git, tmp_dir: TmpDir
+):
+    url = "https://github.com/iterative/dvcyaml-schema"
+
+    p = (
+        Path(os.environ["HOME"] if "HOME" in os.environ else os.environ["USERPROFILE"])
+        / ".gitconfig"
+    )
+    p.write_text(BAD_PROXY_CONFIG)
+    with pytest.raises(Exception):  # noqa: PT011, B017
+        git.fetch_refspecs(url, ["refs/heads/master:refs/heads/master"])
+
+    mock_config_content = f"""[http]
+proxy = {proxy_server}
+[https]
+proxy = {proxy_server}
+"""
+
+    p.write_text(mock_config_content)
+    git.fetch_refspecs(url, "refs/heads/master:refs/heads/master")
+
+
 @pytest.mark.skip_git_backend("pygit2")
 def test_fetch(tmp_dir: TmpDir, scm: Git, git: Git, tmp_dir_factory: TempDirFactory):
     tmp_dir.gen("foo", "foo")

{scmrepo-3.3.7 → scmrepo-3.3.9}/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")