scmrepo 2.1.0__tar.gz → 2.1.1__tar.gz

{scmrepo-2.1.0/src/scmrepo.egg-info → scmrepo-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 2.1.0
+Version: 2.1.1
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0

{scmrepo-2.1.0 → scmrepo-2.1.1}/src/scmrepo/git/backend/pygit2/__init__.py

@@ -646,13 +646,13 @@ 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
 
-        parsed = urlparse(url)
-        if parsed.scheme in ("git", "git+ssh", "ssh") or url.startswith("git@"):
-            raise NotImplementedError
         if os.name == "nt" and url.startswith("file://"):
             url = url[len("file://") :]
-
-        yield self.repo.remotes.create_anonymous(url)
+        remote = self.repo.remotes.create_anonymous(url)
+        parsed = urlparse(remote.url)
+        if parsed.scheme in ("git", "git+ssh", "ssh") or remote.url.startswith("git@"):
+            raise NotImplementedError
+        yield remote
 
     def fetch_refspecs(
         self,

{scmrepo-2.1.0 → scmrepo-2.1.1}/src/scmrepo/git/backend/pygit2/callbacks.py

@@ -11,6 +11,7 @@ from scmrepo.progress import GitProgressReporter
 if TYPE_CHECKING:
     from pygit2 import Oid
     from pygit2.credentials import Keypair, Username, UserPass
+    from pygit2.enums import CredentialType
 
     from scmrepo.progress import GitProgressEvent
 
@@ -45,16 +46,20 @@ class RemoteCallbacks(_RemoteCallbacks, AbstractContextManager):
             self.progress(string)
 
     def credentials(
-        self, url: str, username_from_url: Optional[str], allowed_types: int
+        self,
+        url: str,
+        username_from_url: Optional[str],
+        allowed_types: "CredentialType",
     ) -> "_Pygit2Credential":
         from pygit2 import GitError, Passthrough
-        from pygit2.credentials import GIT_CREDENTIAL_USERPASS_PLAINTEXT, UserPass
+        from pygit2.credentials import UserPass
+        from pygit2.enums import CredentialType
 
         if self._tried_credentials:
             raise GitError(f"authentication failed for '{url}'")
         self._tried_credentials = True
 
-        if allowed_types & GIT_CREDENTIAL_USERPASS_PLAINTEXT:
+        if allowed_types & CredentialType.USERPASS_PLAINTEXT:
             try:
                 if self._store_credentials:
                     creds = self._store_credentials

{scmrepo-2.1.0 → scmrepo-2.1.1}/src/scmrepo/git/lfs/client.py

@@ -1,8 +1,7 @@
 import logging
-from collections.abc import Awaitable, Iterable
+from collections.abc import Iterable
 from contextlib import AbstractContextManager
-from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
 
 import aiohttp
 from dvc_http import HTTPFileSystem
@@ -32,29 +31,6 @@ class _LFSFileSystem(HTTPFileSystem):
         return {}
 
 
-def _authed(f: Callable[..., Awaitable]):
-    """Set credentials and retry the given coroutine if needed."""
-
-    # pylint: disable=protected-access
-    @wraps(f)  # type: ignore[arg-type]
-    async def wrapper(self, *args, **kwargs):
-        try:
-            return await f(self, *args, **kwargs)
-        except aiohttp.ClientResponseError as exc:
-            if exc.status != 401:
-                raise
-            session = await self._set_session()
-            if session.auth:
-                raise
-            auth = self._get_auth()
-            if auth is None:
-                raise
-            self._session._auth = auth
-        return await f(self, *args, **kwargs)
-
-    return wrapper
-
-
 class LFSClient(AbstractContextManager):
     """Naive read-only LFS HTTP client."""
 
@@ -112,7 +88,6 @@ class LFSClient(AbstractContextManager):
     async def _set_session(self) -> aiohttp.ClientSession:
         return await self.fs.fs.set_session()
 
-    @_authed
     async def _batch_request(
         self,
         objects: Iterable[Pointer],
@@ -134,14 +109,30 @@ class LFSClient(AbstractContextManager):
         headers = dict(self.headers)
         headers["Accept"] = self.JSON_CONTENT_TYPE
         headers["Content-Type"] = self.JSON_CONTENT_TYPE
-        async with session.post(
-            url,
-            headers=headers,
-            json=body,
-        ) as resp:
-            return await resp.json()
-
-    @_authed
+        try:
+            async with session.post(
+                url,
+                headers=headers,
+                json=body,
+                raise_for_status=True,
+            ) as resp:
+                data = await resp.json()
+        except aiohttp.ClientResponseError as exc:
+            if exc.status != 401:
+                raise
+            auth = self._get_auth()
+            if auth is None:
+                raise
+            async with session.post(
+                url,
+                auth=auth,
+                headers=headers,
+                json=body,
+                raise_for_status=True,
+            ) as resp:
+                data = await resp.json()
+        return data
+
     async def _download(
         self,
         storage: "LFSStorage",

{scmrepo-2.1.0 → scmrepo-2.1.1/src/scmrepo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 2.1.0
+Version: 2.1.1
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0