From 48da14df0ad9b41ae50167490df5bedba37970f5 Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Sun, 19 May 2024 16:08:36 -0700 Subject: [PATCH 1/4] ignore pip vulnerability --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 6f54073b..d49a2e9f 100644 --- a/noxfile.py +++ b/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 From 77e5aaa0567180bbe83b83525d4781acd79e0593 Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Sun, 19 May 2024 16:28:16 -0700 Subject: [PATCH 2/4] remove deprecated pygit2 GIT_OBJ_COMMIT --- src/scmrepo/git/backend/pygit2/__init__.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/scmrepo/git/backend/pygit2/__init__.py b/src/scmrepo/git/backend/pygit2/__init__.py index e95be5df..4b98ba02 100644 --- a/src/scmrepo/git/backend/pygit2/__init__.py +++ b/src/scmrepo/git/backend/pygit2/__init__.py @@ -190,12 +190,13 @@ def _refdb(self): 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 @@ def tag( 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 @@ def tag( self.repo.create_tag( tag, target_obj.id, - GIT_OBJ_COMMIT, + ObjectType.COMMIT, self.committer, message or "", ) @@ -526,7 +528,8 @@ def set_ref( 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 GIT_REF_SYMBOLIC, InvalidSpecError, Tag + from pygit2.enums import ObjectType try: ref = self.repo.references.get(name) @@ -539,7 +542,7 @@ def get_ref(self, name, follow: bool = True) -> Optional[str]: 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 From 44e74aa98052921bf8b245f2b4af56af7f3e8541 Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Sun, 19 May 2024 16:50:55 -0700 Subject: [PATCH 3/4] remove more deprectated calls and symbols --- src/scmrepo/git/backend/pygit2/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scmrepo/git/backend/pygit2/__init__.py b/src/scmrepo/git/backend/pygit2/__init__.py index 4b98ba02..304098a7 100644 --- a/src/scmrepo/git/backend/pygit2/__init__.py +++ b/src/scmrepo/git/backend/pygit2/__init__.py @@ -72,7 +72,7 @@ def open( 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 @@ def size(self) -> int: # pylint: disable=invalid-overridden-method @property def sha(self) -> str: - return self.obj.hex + return str(self.obj.id) def scandir(self) -> Iterable["Pygit2Object"]: for entry in self.obj: @@ -528,8 +528,8 @@ def set_ref( 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_REF_SYMBOLIC, InvalidSpecError, Tag - from pygit2.enums import ObjectType + from pygit2 import InvalidSpecError, Tag + from pygit2.enums import ObjectType, ReferenceType try: ref = self.repo.references.get(name) @@ -537,7 +537,7 @@ def get_ref(self, name, follow: bool = True) -> Optional[str]: 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] From 19bea69c4c7c76d138258055c62154ac7189aab4 Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Sun, 19 May 2024 17:08:08 -0700 Subject: [PATCH 4/4] deprecated oid to id --- src/scmrepo/git/backend/pygit2/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scmrepo/git/backend/pygit2/__init__.py b/src/scmrepo/git/backend/pygit2/__init__.py index 304098a7..15a22c26 100644 --- a/src/scmrepo/git/backend/pygit2/__init__.py +++ b/src/scmrepo/git/backend/pygit2/__init__.py @@ -844,7 +844,7 @@ def reset(self, hard: bool = False, paths: Optional[Iterable[str]] = None): 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) @@ -1080,7 +1080,7 @@ def get_tag(self, name: str) -> Optional[Union[str, "GitTag"]]: if isinstance(tag, Tag): return GitTag( tag.name, - str(tag.oid), + str(tag.id), str(tag.target), tag.tagger.name, tag.tagger.email,