Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): Update pygit2 requirement from <1.15,>=1.12.0 to >=1.12.0,<1.18 #150

Merged
merged 4 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion oper8/setup_vcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def _make_dest_branch(self, keep_ref: str, is_branch: bool):
self.dest_repo.checkout_ref(branch.name)

# Make a commit with these files
self.dest_repo.create_commit(keep_ref, parents=[root_commit.oid])
self.dest_repo.create_commit(keep_ref, parents=[root_commit.id])

# Check the root branch back out
self.dest_repo.checkout_ref(self.DEFAULT_BRANCH_NAME)
Expand Down
4 changes: 2 additions & 2 deletions oper8/vcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def __init__(self, directory: str, create_if_needed: bool = False, **kwargs):
@property
def head(self) -> str:
"""Get a reference to the current HEAD"""
return self.repo.head.target.hex
return str(self.repo.head.target)

def get_ref(self, refish: str) -> Tuple[Commit, Reference]:
"""Get a git commit and reference from a shorthand string
Expand Down Expand Up @@ -402,7 +402,7 @@ def _create_worktree(
) from err
except GitError as err:
# If reference is already checked out it must have been done by a different process
if str(err) == "reference is already checked out":
if "is already checked out" in str(err):
log.warning(
"Branch %s already checked out by other process",
worktree_name,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies = [
"semver>=2.13.0,<4",
"kubernetes>=25.3.0,<32",
# Until https://github.com/libgit2/pygit2/issues/1292 is resolved
"pygit2>=1.12.0,<1.15",
"pygit2>=1.12.0,<1.18",
]

[project.scripts]
Expand Down
Loading