scmrepo 3.3.6__tar.gz → 3.3.8__tar.gz

{scmrepo-3.3.6 → scmrepo-3.3.8}/.gitignore

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

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

@@ -20,7 +20,7 @@ repos:
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.5.0'
+    rev: 'v0.6.7'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 3.3.6
+Version: 3.3.8
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
@@ -35,8 +35,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.11.2; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

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

@@ -48,9 +48,10 @@ tests = [
     "pytest-mock",
     "pytest-sugar",
     "pytest-test-utils>=0.1.0,<0.2",
+    "proxy.py",
 ]
 dev = [
-    "mypy==1.10.1",
+    "mypy==1.11.2",
     "scmrepo[tests]",
     "types-certifi",
     "types-mock",
@@ -73,6 +74,7 @@ markers = [
 ]
 asyncio_mode = "auto"
 
+
 [tool.coverage.run]
 branch = true
 source = ["scmrepo", "tests"]

{scmrepo-3.3.6 → scmrepo-3.3.8}/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.6 → scmrepo-3.3.8}/src/scmrepo/git/backend/dulwich/asyncssh_vendor.py

@@ -143,7 +143,7 @@ class InteractiveSSHClient(SSHClient):
 
     def __init__(self, *args, **kwargs):
         super(*args, **kwargs)
-        _passphrases: dict[str, str] = {}
+        self._passphrases: dict[str, str] = {}
 
     def connection_made(self, conn: "SSHClientConnection") -> None:
         self._conn = conn

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 3.3.6
+Version: 3.3.8
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
@@ -35,8 +35,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.11.2; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

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

@@ -10,7 +10,7 @@ aiohttp-retry>=2.5.0
 tqdm
 
 [dev]
-mypy==1.10.1
+mypy==1.11.2
 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.6 → scmrepo-3.3.8}/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")