scmrepo 3.3.0__py3-none-any.whl → 3.3.2__py3-none-any.whl

scmrepo/git/backend/pygit2/__init__.py

@@ -2,7 +2,7 @@ import locale
 import logging
 import os
 import stat
-from collections.abc import Generator, Iterable, Iterator, Mapping
+from collections.abc import Iterable, Iterator, Mapping
 from contextlib import contextmanager
 from io import BytesIO, StringIO, TextIOWrapper
 from typing import (
@@ -25,6 +25,7 @@ from scmrepo.exceptions import (
 from scmrepo.git.backend.base import BaseGitBackend, SyncStatus
 from scmrepo.git.config import Config
 from scmrepo.git.objects import GitCommit, GitObject, GitTag
+from scmrepo.urls import is_scp_style_url
 from scmrepo.utils import relpath
 
 logger = logging.getLogger(__name__)
@@ -636,7 +637,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         raise SCMError("Unknown merge analysis result")
 
     @contextmanager
-    def _get_remote(self, url: str) -> Generator["Remote", None, None]:
+    def _get_remote(self, url: str) -> Iterator["Remote"]:
         """Return a pygit2.Remote suitable for the specified Git URL or remote name."""
         try:
             remote = self.repo.remotes[url]
@@ -646,11 +647,11 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         except KeyError as exc:
             raise SCMError(f"'{url}' is not a valid Git remote or URL") from exc
 
-        if os.name == "nt" and url.startswith("file://"):
-            url = url[len("file://") :]
+        if os.name == "nt":
+            url = url.removeprefix("file://")
         remote = self.repo.remotes.create_anonymous(url)
         parsed = urlparse(remote.url)
-        if parsed.scheme in ("git", "git+ssh", "ssh") or remote.url.startswith("git@"):
+        if parsed.scheme in ("git", "git+ssh", "ssh") or is_scp_style_url(remote.url):
             raise NotImplementedError
         yield remote
 

scmrepo/git/lfs/client.py

@@ -1,7 +1,6 @@
 import json
 import logging
 import os
-import re
 import shutil
 from abc import abstractmethod
 from collections.abc import Iterable, Iterator
@@ -10,6 +9,7 @@ from http import HTTPStatus
 from tempfile import NamedTemporaryFile
 from time import time
 from typing import TYPE_CHECKING, Any, Optional
+from urllib.parse import urlparse
 
 import aiohttp
 from aiohttp_retry import ExponentialRetry, RetryClient
@@ -20,6 +20,7 @@ from funcy import cached_property
 
 from scmrepo.git.backend.dulwich import _get_ssh_vendor
 from scmrepo.git.credentials import Credential, CredentialNotFoundError
+from scmrepo.urls import SCP_REGEX, is_scp_style_url
 
 from .exceptions import LFSError
 from .pointer import Pointer
@@ -84,9 +85,9 @@ class LFSClient(AbstractContextManager):
 
     @classmethod
     def from_git_url(cls, git_url: str) -> "LFSClient":
-        if git_url.startswith(("ssh://", "git@")):
+        if git_url.startswith("ssh://") or is_scp_style_url(git_url):
             return _SSHLFSClient.from_git_url(git_url)
-        if git_url.startswith("https://"):
+        if git_url.startswith(("http://", "https://")):
             return _HTTPLFSClient.from_git_url(git_url)
         raise NotImplementedError(f"Unsupported Git URL: {git_url}")
 
@@ -213,11 +214,9 @@ class _HTTPLFSClient(LFSClient):
 
 
 class _SSHLFSClient(LFSClient):
-    _URL_PATTERN = re.compile(
-        r"(?:ssh://)?git@(?P<host>\S+?)(?::(?P<port>\d+))?(?:[:/])(?P<path>\S+?)\.git"
-    )
-
-    def __init__(self, url: str, host: str, port: int, path: str):
+    def __init__(
+        self, url: str, host: str, port: int, username: Optional[str], path: str
+    ):
         """
         Args:
             url: LFS server URL.
@@ -228,25 +227,42 @@ class _SSHLFSClient(LFSClient):
         super().__init__(url)
         self.host = host
         self.port = port
+        self.username = username
         self.path = path
         self._ssh = _get_ssh_vendor()
 
     @classmethod
     def from_git_url(cls, git_url: str) -> "_SSHLFSClient":
-        result = cls._URL_PATTERN.match(git_url)
-        if not result:
+        if scp_match := SCP_REGEX.match(git_url):
+            # Add an ssh:// prefix and replace the ':' with a '/'.
+            git_url = scp_match.expand(r"ssh://\1\2/\3")
+
+        parsed = urlparse(git_url)
+        if parsed.scheme != "ssh" or not parsed.hostname:
             raise ValueError(f"Invalid Git SSH URL: {git_url}")
-        host, port, path = result.group("host", "port", "path")
-        url = f"https://{host}/{path}.git/info/lfs"
-        return cls(url, host, int(port or 22), path)
+
+        host = parsed.hostname
+        port = parsed.port or 22
+        path = parsed.path.lstrip("/")
+        username = parsed.username
+
+        url_path = path.removesuffix(".git") + ".git/info/lfs"
+        url = f"https://{host}/{url_path}"
+        return cls(url, host, port, username, path)
 
     def _get_auth_header(self, *, upload: bool) -> dict:
         return self._git_lfs_authenticate(
-            self.host, self.port, f"{self.path}.git", upload=upload
+            self.host, self.port, self.username, self.path, upload=upload
         ).get("header", {})
 
     def _git_lfs_authenticate(
-        self, host: str, port: int, path: str, *, upload: bool = False
+        self,
+        host: str,
+        port: int,
+        username: Optional[str],
+        path: str,
+        *,
+        upload: bool = False,
     ) -> dict:
         action = "upload" if upload else "download"
         return json.loads(
@@ -254,7 +270,7 @@ class _SSHLFSClient(LFSClient):
                 command=f"git-lfs-authenticate {path} {action}",
                 host=host,
                 port=port,
-                username="git",
+                username=username,
             ).read()
         )
 

scmrepo/urls.py

@@ -0,0 +1,21 @@
+import re
+
+# from https://github.com/pypa/pip/blob/303fed36c1771de4063063a866776a9103972317/src/pip/_internal/vcs/git.py#L40
+# SCP (Secure copy protocol) shorthand. e.g. 'git@example.com:foo/bar.git'
+SCP_REGEX = re.compile(
+    r"""^
+    # Optional user, e.g. 'git@'
+    (\w+@)?
+    # Server, e.g. 'github.com'.
+    ([^/:]+):
+    # The server-side path. e.g. 'user/project.git'. Must start with an
+    # alphanumeric character so as not to be confusable with a Windows paths
+    # like 'C:/foo/bar' or 'C:\foo\bar'.
+    (\w[^:]*)
+    $""",
+    re.VERBOSE,
+)
+
+
+def is_scp_style_url(url: str) -> bool:
+    return bool(SCP_REGEX.match(url))

{scmrepo-3.3.0.dist-info → scmrepo-3.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 3.3.0
+Version: 3.3.2
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
@@ -16,7 +16,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: gitpython >3
-Requires-Dist: dulwich >=0.21.6
+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
@@ -26,22 +26,22 @@ Requires-Dist: funcy >=1.14
 Requires-Dist: aiohttp-retry >=2.5.0
 Requires-Dist: tqdm
 Provides-Extra: dev
+Requires-Dist: mypy ==1.9.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'
 Provides-Extra: tests
-Requires-Dist: pytest ==8.1.1 ; extra == 'tests'
-Requires-Dist: pytest-sugar ==1.0.0 ; extra == 'tests'
-Requires-Dist: pytest-cov ==4.1.0 ; extra == 'tests'
-Requires-Dist: pytest-mock ==3.12.0 ; extra == 'tests'
-Requires-Dist: mypy ==1.9.0 ; extra == 'tests'
-Requires-Dist: pytest-test-utils ==0.1.0 ; extra == 'tests'
-Requires-Dist: pytest-asyncio ==0.23.5 ; extra == 'tests'
-Requires-Dist: pytest-docker ==3.1.1 ; extra == 'tests'
-Requires-Dist: mock ==5.1.0 ; extra == 'tests'
-Requires-Dist: paramiko ==3.4.0 ; extra == 'tests'
-Requires-Dist: types-certifi ==2021.10.8.3 ; extra == 'tests'
-Requires-Dist: types-mock ==5.1.0.20240311 ; extra == 'tests'
-Requires-Dist: types-paramiko ==3.4.0.20240205 ; extra == 'tests'
-Requires-Dist: types-tqdm ; 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'
 
 scmrepo
 =======

{scmrepo-3.3.0.dist-info → scmrepo-3.3.2.dist-info}/RECORD

@@ -6,6 +6,7 @@ scmrepo/fs.py,sha256=ARD8_TRSdHpuiaYwF7QXrQIyfl9AFj7ctv_Ltc6pAAs,7740
 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/config.py,sha256=0t0OBmJ9SIa5tf22QdcGzhZfdMzzppvEmceUDg8ZPyE,943
@@ -18,11 +19,11 @@ scmrepo/git/backend/gitpython.py,sha256=RTDNUVLiJmhcRgdaJpApTQi6sMN-an9P9xKZBKwk
 scmrepo/git/backend/dulwich/__init__.py,sha256=x6DsVddlEeUW39-0WPjRFjRlqc3U2f0opZ1Hm2pvBts,34820
 scmrepo/git/backend/dulwich/asyncssh_vendor.py,sha256=y0mvx3tRR99Nv85e2n39nPYlhme8dplmQQSbSpx7FDM,11562
 scmrepo/git/backend/dulwich/client.py,sha256=bcDroljSvNz6s5WWv9UVvZHKkOJOVTK_zU7YCq62TN4,2360
-scmrepo/git/backend/pygit2/__init__.py,sha256=_cMmUDuGQJA0ma2ug7QE4bpgj31o-s-YCgGf3RZllrM,37042
+scmrepo/git/backend/pygit2/__init__.py,sha256=gNOFVLgB8gpXSKfuL_-Vk7GhVkZk6DiwuJMahel0Ue0,37035
 scmrepo/git/backend/pygit2/callbacks.py,sha256=Ky4YmUPhv9xjU_44ypBYIcaVHJixzaGb6t9HIeUmBP4,2751
 scmrepo/git/backend/pygit2/filter.py,sha256=2NlWfQ7soXN1H7Es6-LctE74hpj3QKQTlYqXRH83VpM,2128
 scmrepo/git/lfs/__init__.py,sha256=at5blRIKnKpg_g5dLRDsGWBFi6SbucRlF_DX6aAkGtE,257
-scmrepo/git/lfs/client.py,sha256=UCGyComKAp1OV7gFi2CxWp_pXqV4hxbg3JGSRTCBtIk,9707
+scmrepo/git/lfs/client.py,sha256=SLlGFC09YD55nTDQ7MjuKD9alql-eOriyNePZikFaYo,10171
 scmrepo/git/lfs/exceptions.py,sha256=cLlImmPXWJJUl44S4xcRBa2T9wYRkWTaKQGwJylwOhA,77
 scmrepo/git/lfs/fetch.py,sha256=ADNpskbDrvMI7ru4AiOf_c1gfw8TQ7Wct0EiN2Pq-qc,4683
 scmrepo/git/lfs/object.py,sha256=rAYY_z9EYoHPfbpF1QHwL7ecYgaETPyCl-zBx0E1oIQ,337
@@ -30,8 +31,8 @@ scmrepo/git/lfs/pointer.py,sha256=BcVbtjoOUG9cEzyJSJDeweqehGZvq43P6NNLDYUGYEI,31
 scmrepo/git/lfs/progress.py,sha256=ELlBs2SeXhAcnPDN23w3FTeBRgB9RGqBD2CFMS6n9Xs,4750
 scmrepo/git/lfs/smudge.py,sha256=1O_fznptWo4CKXqcJgUoWP6cgWWhvGAZ3d87kasG3cQ,1610
 scmrepo/git/lfs/storage.py,sha256=2weDldy6MFrA8IDzBczsPy8fBWCp4FKaJTT0f6eIT64,2396
-scmrepo-3.3.0.dist-info/LICENSE,sha256=-1jhbPjoIVHR0cEgahL4Zhct75Ff4MzYCR_jOaJDPq8,11340
-scmrepo-3.3.0.dist-info/METADATA,sha256=JM8IWrpExncQB-RqmqbyazEAQwjr78ipbfuT5C5Zxvs,4785
-scmrepo-3.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-scmrepo-3.3.0.dist-info/top_level.txt,sha256=iunjod6w3GogERsAYfLRupnANXnqzX3jbIfbeIQG5cc,8
-scmrepo-3.3.0.dist-info/RECORD,,
+scmrepo-3.3.2.dist-info/LICENSE,sha256=-1jhbPjoIVHR0cEgahL4Zhct75Ff4MzYCR_jOaJDPq8,11340
+scmrepo-3.3.2.dist-info/METADATA,sha256=RoEcoxC9ReqV3Eh0lgIQRHVnBLrZeRs5z4px6SpDZb0,4730
+scmrepo-3.3.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+scmrepo-3.3.2.dist-info/top_level.txt,sha256=iunjod6w3GogERsAYfLRupnANXnqzX3jbIfbeIQG5cc,8
+scmrepo-3.3.2.dist-info/RECORD,,