scmrepo 3.3.2__tar.gz → 3.3.4__tar.gz

{scmrepo-3.3.2 → scmrepo-3.3.4}/.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.5.0
+    rev: v4.6.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.3.5'
+    rev: 'v0.4.3'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

{scmrepo-3.3.2/src/scmrepo.egg-info → scmrepo-3.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 3.3.2
+Version: 3.3.4
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
@@ -36,7 +36,7 @@ Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-test-utils<0.2,>=0.1.0; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: mypy==1.9.0; extra == "dev"
+Requires-Dist: mypy==1.10.0; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

{scmrepo-3.3.2 → scmrepo-3.3.4}/noxfile.py

@@ -37,7 +37,7 @@ def safety(session: nox.Session) -> None:
     """Scan dependencies for insecure packages."""
     session.install(".[dev]")
     session.install("safety")
-    session.run("safety", "check", "--full-report")
+    session.run("safety", "check", "--full-report", "--ignore=67599")
 
 
 @nox.session

{scmrepo-3.3.2 → scmrepo-3.3.4}/pyproject.toml

@@ -50,7 +50,7 @@ tests = [
     "pytest-test-utils>=0.1.0,<0.2",
 ]
 dev = [
-    "mypy==1.9.0",
+    "mypy==1.10.0",
     "scmrepo[tests]",
     "types-certifi",
     "types-mock",

{scmrepo-3.3.2 → scmrepo-3.3.4}/src/scmrepo/git/backend/dulwich/__init__.py

@@ -264,7 +264,7 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
                     cls._set_mirror(repo, progress=progress)
                 else:
                     cls._set_default_tracking_branch(repo)
-        except Exception as exc:  # noqa: BLE001
+        except Exception as exc:
             raise CloneError(url, os.fsdecode(to_path)) from exc
 
     @staticmethod
@@ -580,7 +580,7 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
         try:
             _remote, location = get_remote_repo(self.repo, url)
             client, path = get_transport_and_path(location, **kwargs)
-        except Exception as exc:  # noqa: BLE001
+        except Exception as exc:
             raise InvalidRemote(url) from exc
 
         try:
@@ -617,7 +617,7 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
         try:
             _remote, location = get_remote_repo(self.repo, url)
             client, path = get_transport_and_path(location, **kwargs)
-        except Exception as exc:  # noqa: BLE001
+        except Exception as exc:
             raise SCMError(f"'{url}' is not a valid Git remote or URL") from exc
 
         change_result = {}
@@ -910,7 +910,7 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
         try:
             _, location = get_remote_repo(self.repo, url)
             client, path = get_transport_and_path(location, **kwargs)
-        except Exception as exc:  # noqa: BLE001
+        except Exception as exc:
             raise InvalidRemote(url) from exc
         if isinstance(client, LocalGitClient) and not os.path.exists(
             os.path.join("", path)
@@ -989,5 +989,5 @@ def ls_remote(url: str) -> dict[str, str]:
         return {os.fsdecode(ref): sha.decode("ascii") for ref, sha in refs.items()}
     except HTTPUnauthorized as exc:
         raise AuthError(url) from exc
-    except Exception as exc:  # noqa: BLE001
+    except Exception as exc:
         raise InvalidRemote(url) from exc

{scmrepo-3.3.2 → scmrepo-3.3.4}/src/scmrepo/git/backend/pygit2/__init__.py

@@ -72,7 +72,7 @@ class Pygit2Object(GitObject):
                     path = "/".join(key)
                     blob_kwargs = {
                         "as_path": path,
-                        "commit_id": commit.oid,
+                        "commit_id": commit.id,
                     }
                 blobio = BlobIO(self.obj, **blob_kwargs)
                 if mode == "rb":
@@ -108,7 +108,7 @@ class Pygit2Object(GitObject):
 
     @property
     def sha(self) -> str:
-        return self.obj.hex
+        return str(self.obj.id)
 
     def scandir(self) -> Iterable["Pygit2Object"]:
         for entry in self.obj:
@@ -190,12 +190,13 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         return RefdbFsBackend(self.repo)
 
     def _resolve_refish(self, refish: str):
-        from pygit2 import GIT_OBJ_COMMIT, Tag
+        from pygit2 import Tag
+        from pygit2.enums import ObjectType
 
         commit, ref = self.repo.resolve_refish(refish)
         if isinstance(commit, Tag):
             ref = commit
-            commit = commit.peel(GIT_OBJ_COMMIT)
+            commit = commit.peel(ObjectType.COMMIT)
         return commit, ref
 
     @property
@@ -395,7 +396,8 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         annotated: bool = False,
         message: Optional[str] = None,
     ):
-        from pygit2 import GIT_OBJ_COMMIT, GitError
+        from pygit2 import GitError
+        from pygit2.enums import ObjectType
 
         if annotated and not message:
             raise SCMError("message is required for annotated tag")
@@ -404,7 +406,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
             self.repo.create_tag(
                 tag,
                 target_obj.id,
-                GIT_OBJ_COMMIT,
+                ObjectType.COMMIT,
                 self.committer,
                 message or "",
             )
@@ -526,7 +528,8 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
             self.repo.create_reference_direct(name, new_ref, True, message=message)
 
     def get_ref(self, name, follow: bool = True) -> Optional[str]:
-        from pygit2 import GIT_OBJ_COMMIT, GIT_REF_SYMBOLIC, InvalidSpecError, Tag
+        from pygit2 import InvalidSpecError, Tag
+        from pygit2.enums import ObjectType, ReferenceType
 
         try:
             ref = self.repo.references.get(name)
@@ -534,12 +537,12 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
             return None
         if not ref:
             return None
-        if follow and ref.type == GIT_REF_SYMBOLIC:
+        if follow and ref.type == ReferenceType.SYMBOLIC:
             ref = ref.resolve()
         try:
             obj = self.repo[ref.target]
             if isinstance(obj, Tag):
-                return str(obj.peel(GIT_OBJ_COMMIT).id)
+                return str(obj.peel(ObjectType.COMMIT).id)
         except ValueError:
             pass
 
@@ -841,7 +844,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                 if os.name == "nt":
                     rel = rel.replace("\\", "/")
                 obj = tree[rel]
-                self.repo.index.add(IndexEntry(rel, obj.oid, obj.filemode))
+                self.repo.index.add(IndexEntry(rel, obj.id, obj.filemode))
             self.repo.index.write()
         elif hard:
             self.repo.reset(self.repo.head.target, GIT_RESET_HARD)
@@ -1077,7 +1080,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
             if isinstance(tag, Tag):
                 return GitTag(
                     tag.name,
-                    str(tag.oid),
+                    str(tag.id),
                     str(tag.target),
                     tag.tagger.name,
                     tag.tagger.email,

{scmrepo-3.3.2 → scmrepo-3.3.4}/src/scmrepo/git/lfs/fetch.py

@@ -1,6 +1,7 @@
 import fnmatch
 import io
 import os
+import re
 from collections.abc import Iterable, Iterator
 from typing import TYPE_CHECKING, Callable, Optional
 
@@ -98,6 +99,9 @@ def get_fetch_url(scm: "Git", remote: Optional[str] = None):  # noqa: C901,PLR09
     return scm.get_remote_url(remote)
 
 
+_ROOT_PATH_PREFIX_REGEX = re.compile(r"^(?P<prefix>[^*?\[]*(?:/|$))")
+
+
 def _collect_objects(
     scm: "Git",
     rev: str,
@@ -105,7 +109,25 @@ def _collect_objects(
     exclude: Optional[list[str]],
 ) -> Iterator[Pointer]:
     fs = scm.get_fs(rev)
-    for path in _filter_paths(fs.find("/"), include, exclude):
+    # Optimize path filtering if the `include` list contains exactly one path.
+    # First, determine the root directory wherein to initiate the file search.
+    # If the `include` path is a Unix filename pattern, determine the static
+    # path prefix and set it as the root directory. Second, if the path and the
+    # root are identical or the Unix filename pattern matches *any* (i.e., `**`)
+    # file under the root directory, unset `include` to avoid unnecessary
+    # filtering work.
+    if (
+        include
+        and len(include) == 1
+        and (result := _ROOT_PATH_PREFIX_REGEX.match(path := include[0]))
+    ):
+        root = result.group("prefix")
+        if path in {root, f'{root.rstrip("/")}/**'}:
+            include = []
+    else:
+        root = "/"
+
+    for path in _filter_paths(fs.find(root), include, exclude):
         check_path = path.lstrip("/")
         if scm.check_attr(check_path, "filter", source=rev) == "lfs":
             try:

{scmrepo-3.3.2 → scmrepo-3.3.4}/src/scmrepo/git/lfs/storage.py

@@ -53,7 +53,7 @@ class LFSStorage:
                 raise
         try:
             self.fetch(fetch_url, [obj], batch_size=batch_size)
-        except BaseException as exc:  # noqa: BLE001
+        except BaseException as exc:
             raise FileNotFoundError(
                 errno.ENOENT, os.strerror(errno.ENOENT), path
             ) from exc

{scmrepo-3.3.2 → scmrepo-3.3.4}/src/scmrepo/git/stash.py

@@ -53,7 +53,7 @@ class Stash:
         rev = self.scm.resolve_rev(ref)
         try:
             self.apply(rev, **kwargs)
-        except Exception as exc:  # noqa: BLE001
+        except Exception as exc:
             raise SCMError("Could not apply stash commit") from exc
         self.drop()
         return rev

{scmrepo-3.3.2 → scmrepo-3.3.4/src/scmrepo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 3.3.2
+Version: 3.3.4
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
@@ -36,7 +36,7 @@ Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-test-utils<0.2,>=0.1.0; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: mypy==1.9.0; extra == "dev"
+Requires-Dist: mypy==1.10.0; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

{scmrepo-3.3.2 → scmrepo-3.3.4}/src/scmrepo.egg-info/requires.txt

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