scmrepo 3.3.3__tar.gz → 3.3.5__tar.gz

{scmrepo-3.3.3 → scmrepo-3.3.5}/.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.4.3'
+    rev: 'v0.4.4'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

{scmrepo-3.3.3/src/scmrepo.egg-info → scmrepo-3.3.5}/PKG-INFO

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

{scmrepo-3.3.3 → scmrepo-3.3.5}/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.3 → scmrepo-3.3.5}/pyproject.toml

@@ -125,6 +125,10 @@ ignore_missing_imports = true
 ignore-words-list = "cachable, keypair"
 
 [tool.ruff]
+output-format = "full"
+show-fixes = true
+
+[tool.ruff.lint]
 ignore = [
     "S101", # assert
     "PLR2004", # magic-value-comparison
@@ -180,10 +184,8 @@ select = [
     "W", # pycodestyle - Warning
     "YTT", # flake8-2020
 ]
-show-source = true
-show-fixes = true
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "noxfile.py" = ["D", "PTH"]
 "tests/**" = ["S", "ARG001", "ARG002", "ANN"]
 "docs/**" = ["INP"]
@@ -199,5 +201,5 @@ strict = true
 [tool.ruff.lint.isort]
 known-first-party = ["scmrepo"]
 
-[tool.ruff.pylint]
+[tool.ruff.lint.pylint]
 max-args = 10

{scmrepo-3.3.3 → scmrepo-3.3.5}/src/scmrepo/git/backend/pygit2/__init__.py

@@ -34,6 +34,7 @@ logger = logging.getLogger(__name__)
 if TYPE_CHECKING:
     from pygit2 import Commit, Oid, Signature
     from pygit2.config import Config as _Pygit2Config
+    from pygit2.enums import CheckoutStrategy
     from pygit2.remotes import Remote
     from pygit2.repository import Repository
 
@@ -72,7 +73,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 +109,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 +191,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
@@ -245,17 +247,15 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         )
 
     @staticmethod
-    def _get_checkout_strategy(strategy: Optional[int] = None):
-        from pygit2 import (
-            GIT_CHECKOUT_RECREATE_MISSING,
-            GIT_CHECKOUT_SAFE,
-            GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES,
-        )
+    def _get_checkout_strategy(
+        strategy: Optional["CheckoutStrategy"] = None,
+    ) -> "CheckoutStrategy":
+        from pygit2.enums import CheckoutStrategy
 
         if strategy is None:
-            strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING
+            strategy = CheckoutStrategy.SAFE | CheckoutStrategy.RECREATE_MISSING
         if os.name == "nt":
-            strategy |= GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES
+            strategy |= CheckoutStrategy.SKIP_LOCKED_DIRECTORIES
         return strategy
 
     # Workaround to force git_backend_odb_pack to release open file handles
@@ -342,9 +342,12 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         force: bool = False,
         **kwargs,
     ):
-        from pygit2 import GIT_CHECKOUT_FORCE, GitError
+        from pygit2 import GitError
+        from pygit2.enums import CheckoutStrategy
 
-        strategy = self._get_checkout_strategy(GIT_CHECKOUT_FORCE if force else None)
+        strategy = self._get_checkout_strategy(
+            CheckoutStrategy.FORCE if force else None
+        )
 
         with self.release_odb_handles():
             if create_new:
@@ -395,7 +398,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 +408,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 +530,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 +539,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
 
@@ -610,7 +615,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         force: bool = False,
         on_diverged: Optional[Callable[[str, str], bool]] = None,
     ) -> SyncStatus:
-        import pygit2
+        from pygit2.enums import MergeAnalysis
 
         rh_rev = self.resolve_rev(rh)
 
@@ -624,16 +629,16 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
             self.set_ref(lh, rh_rev)
             return SyncStatus.SUCCESS
 
-        if merge_result & pygit2.GIT_MERGE_ANALYSIS_UP_TO_DATE:
+        if merge_result & MergeAnalysis.UP_TO_DATE:
             return SyncStatus.UP_TO_DATE
-        if merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
+        if merge_result & MergeAnalysis.FASTFORWARD:
             self.set_ref(lh, rh_rev)
             return SyncStatus.SUCCESS
-        if merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
+        if merge_result & MergeAnalysis.NORMAL:
             if on_diverged and on_diverged(lh, rh_rev):
                 return SyncStatus.SUCCESS
             return SyncStatus.DIVERGED
-        logger.debug("Unexpected merge result: %s", pygit2.GIT_MERGE_ANALYSIS_NORMAL)
+        logger.debug("Unexpected merge result: %s", MergeAnalysis.NORMAL)
         raise SCMError("Unknown merge analysis result")
 
     @contextmanager
@@ -776,7 +781,8 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         skip_conflicts: bool = False,
         **kwargs,
     ):
-        from pygit2 import GIT_CHECKOUT_ALLOW_CONFLICTS, GitError
+        from pygit2 import GitError
+        from pygit2.enums import CheckoutStrategy
 
         from scmrepo.git import Stash
 
@@ -785,7 +791,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                 self.repo.index.read(False)
                 strategy = self._get_checkout_strategy()
                 if skip_conflicts:
-                    strategy |= GIT_CHECKOUT_ALLOW_CONFLICTS
+                    strategy |= CheckoutStrategy.ALLOW_CONFLICTS
                 self.repo.stash_apply(
                     index, strategy=strategy, reinstate_index=reinstate_index
                 )
@@ -831,7 +837,8 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         raise NotImplementedError
 
     def reset(self, hard: bool = False, paths: Optional[Iterable[str]] = None):
-        from pygit2 import GIT_RESET_HARD, GIT_RESET_MIXED, IndexEntry
+        from pygit2 import IndexEntry
+        from pygit2.enums import ResetMode
 
         self.repo.index.read(False)
         if paths is not None:
@@ -841,12 +848,12 @@ 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)
+            self.repo.reset(self.repo.head.target, ResetMode.HARD)
         else:
-            self.repo.reset(self.repo.head.target, GIT_RESET_MIXED)
+            self.repo.reset(self.repo.head.target, ResetMode.MIXED)
 
     def checkout_index(
         self,
@@ -855,22 +862,17 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         ours: bool = False,
         theirs: bool = False,
     ):
-        from pygit2 import (
-            GIT_CHECKOUT_ALLOW_CONFLICTS,
-            GIT_CHECKOUT_FORCE,
-            GIT_CHECKOUT_RECREATE_MISSING,
-            GIT_CHECKOUT_SAFE,
-        )
+        from pygit2.enums import CheckoutStrategy
 
         assert not (ours and theirs)
-        strategy = GIT_CHECKOUT_RECREATE_MISSING
+        strategy = CheckoutStrategy.RECREATE_MISSING
         if force or ours or theirs:
-            strategy |= GIT_CHECKOUT_FORCE
+            strategy |= CheckoutStrategy.FORCE
         else:
-            strategy |= GIT_CHECKOUT_SAFE
+            strategy |= CheckoutStrategy.SAFE
 
         if ours or theirs:
-            strategy |= GIT_CHECKOUT_ALLOW_CONFLICTS
+            strategy |= CheckoutStrategy.ALLOW_CONFLICTS
         strategy = self._get_checkout_strategy(strategy)
 
         index = self.repo.index
@@ -907,18 +909,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
     def status(
         self, ignored: bool = False, untracked_files: str = "all"
     ) -> tuple[Mapping[str, Iterable[str]], Iterable[str], Iterable[str]]:
-        from pygit2 import (
-            GIT_STATUS_IGNORED,
-            GIT_STATUS_INDEX_DELETED,
-            GIT_STATUS_INDEX_MODIFIED,
-            GIT_STATUS_INDEX_NEW,
-            GIT_STATUS_WT_DELETED,
-            GIT_STATUS_WT_MODIFIED,
-            GIT_STATUS_WT_NEW,
-            GIT_STATUS_WT_RENAMED,
-            GIT_STATUS_WT_TYPECHANGE,
-            GIT_STATUS_WT_UNREADABLE,
-        )
+        from pygit2.enums import FileStatus
 
         staged: Mapping[str, list[str]] = {
             "add": [],
@@ -929,19 +920,19 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         untracked: list[str] = []
 
         states = {
-            GIT_STATUS_WT_NEW: untracked,
-            GIT_STATUS_WT_MODIFIED: unstaged,
-            GIT_STATUS_WT_TYPECHANGE: staged["modify"],
-            GIT_STATUS_WT_DELETED: staged["modify"],
-            GIT_STATUS_WT_RENAMED: staged["modify"],
-            GIT_STATUS_INDEX_NEW: staged["add"],
-            GIT_STATUS_INDEX_MODIFIED: staged["modify"],
-            GIT_STATUS_INDEX_DELETED: staged["delete"],
-            GIT_STATUS_WT_UNREADABLE: untracked,
+            FileStatus.WT_NEW: untracked,
+            FileStatus.WT_MODIFIED: unstaged,
+            FileStatus.WT_TYPECHANGE: staged["modify"],
+            FileStatus.WT_DELETED: staged["modify"],
+            FileStatus.WT_RENAMED: staged["modify"],
+            FileStatus.INDEX_NEW: staged["add"],
+            FileStatus.INDEX_MODIFIED: staged["modify"],
+            FileStatus.INDEX_DELETED: staged["delete"],
+            FileStatus.WT_UNREADABLE: untracked,
         }
 
         if untracked_files != "no" and ignored:
-            states[GIT_STATUS_IGNORED] = untracked
+            states[FileStatus.IGNORED] = untracked
 
         for file, state in self.repo.status(
             untracked_files=untracked_files, ignored=ignored
@@ -960,22 +951,15 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
     def iter_remote_refs(self, url: str, base: Optional[str] = None, **kwargs):
         raise NotImplementedError
 
-    def merge(  # noqa: C901
+    def merge(  # noqa: C901, PLR0912
         self,
         rev: str,
         commit: bool = True,
         msg: Optional[str] = None,
         squash: bool = False,
     ) -> Optional[str]:
-        from pygit2 import (
-            GIT_MERGE_ANALYSIS_FASTFORWARD,
-            GIT_MERGE_ANALYSIS_NONE,
-            GIT_MERGE_ANALYSIS_UNBORN,
-            GIT_MERGE_ANALYSIS_UP_TO_DATE,
-            GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY,
-            GIT_MERGE_PREFERENCE_NO_FASTFORWARD,
-            GitError,
-        )
+        from pygit2 import GitError
+        from pygit2.enums import MergeAnalysis, MergePreference
 
         if commit and squash:
             raise SCMError("Cannot merge with 'squash' and 'commit'")
@@ -988,9 +972,9 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
             except GitError as exc:
                 raise SCMError("Merge analysis failed") from exc
 
-            if analysis == GIT_MERGE_ANALYSIS_NONE:
+            if analysis == MergeAnalysis.NONE:
                 raise SCMError(f"'{rev}' cannot be merged into HEAD")
-            if analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE:
+            if analysis & MergeAnalysis.UP_TO_DATE:
                 return None
 
             try:
@@ -1003,15 +987,15 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                 raise MergeConflictError("Merge contained conflicts")
 
             try:
-                if not (squash or ff_pref & GIT_MERGE_PREFERENCE_NO_FASTFORWARD):
-                    if analysis & GIT_MERGE_ANALYSIS_FASTFORWARD:
+                if not (squash or ff_pref & MergePreference.NO_FASTFORWARD):
+                    if analysis & MergeAnalysis.FASTFORWARD:
                         return self._merge_ff(rev, obj)
 
-                    if analysis & GIT_MERGE_ANALYSIS_UNBORN:
+                    if analysis & MergeAnalysis.UNBORN:
                         self.repo.set_head(obj.id)
                         return str(obj.id)
 
-                if ff_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY:
+                if ff_pref & MergePreference.FASTFORWARD_ONLY:
                     raise SCMError(f"Cannot fast-forward HEAD to '{rev}'")
 
                 if commit:
@@ -1077,7 +1061,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,
@@ -1102,19 +1086,15 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         attr: str,
         source: Optional[str] = None,
     ) -> Optional[Union[bool, str]]:
-        from pygit2 import (
-            GIT_ATTR_CHECK_FILE_THEN_INDEX,
-            GIT_ATTR_CHECK_INCLUDE_COMMIT,
-            GIT_ATTR_CHECK_INDEX_ONLY,
-            GitError,
-        )
+        from pygit2 import GitError
+        from pygit2.enums import AttrCheck
 
         commit: Optional["Commit"] = None
-        flags = GIT_ATTR_CHECK_FILE_THEN_INDEX
+        flags = AttrCheck.FILE_THEN_INDEX
         if source:
             try:
                 commit, _ref = self._resolve_refish(source)
-                flags = GIT_ATTR_CHECK_INDEX_ONLY | GIT_ATTR_CHECK_INCLUDE_COMMIT
+                flags = AttrCheck.INDEX_ONLY | AttrCheck.INCLUDE_COMMIT
             except (KeyError, GitError) as exc:
                 raise SCMError(f"Invalid commit '{source}'") from exc
         try:

{scmrepo-3.3.3 → scmrepo-3.3.5/src/scmrepo.egg-info}/PKG-INFO

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