wexample-helpers-git 6.11.2__tar.gz → 7.0.0__tar.gz

{wexample_helpers_git-6.11.2 → wexample_helpers_git-7.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-helpers-git
-Version: 6.11.2
+Version: 7.0.0
 Summary: Some python basic helpers for git.
 Author-Email: weeger <contact@wexample.com>
 License: MIT
@@ -12,7 +12,7 @@ Requires-Python: >=3.10
 Requires-Dist: attrs>=23.1.0
 Requires-Dist: cattrs>=23.1.0
 Requires-Dist: gitpython
-Requires-Dist: wexample-helpers>=17.3.0
+Requires-Dist: wexample-helpers>=19.0.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 
 # helpers_git
 
-Version: 6.11.2
+Version: 7.0.0
 
 Some python basic helpers for git.
 
@@ -103,7 +103,7 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - attrs: >=23.1.0
 - cattrs: >=23.1.0
 - gitpython: 
-- wexample-helpers: >=17.3.0
+- wexample-helpers: >=19.0.0
 
 ## Versioning & Compatibility Policy
 

{wexample_helpers_git-6.11.2 → wexample_helpers_git-7.0.0}/README.md

@@ -1,6 +1,6 @@
 # helpers_git
 
-Version: 6.11.2
+Version: 7.0.0
 
 Some python basic helpers for git.
 
@@ -83,7 +83,7 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - attrs: >=23.1.0
 - cattrs: >=23.1.0
 - gitpython: 
-- wexample-helpers: >=17.3.0
+- wexample-helpers: >=19.0.0
 
 ## Versioning & Compatibility Policy
 

{wexample_helpers_git-6.11.2 → wexample_helpers_git-7.0.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-helpers-git"
-version = "6.11.2"
+version = "7.0.0"
 description = "Some python basic helpers for git."
 authors = [
     { name = "weeger", email = "contact@wexample.com" },
@@ -21,7 +21,7 @@ dependencies = [
     "attrs>=23.1.0",
     "cattrs>=23.1.0",
     "gitpython",
-    "wexample-helpers>=17.3.0",
+    "wexample-helpers>=19.0.0",
 ]
 
 [project.readme]

{wexample_helpers_git-6.11.2/src/wexample_helpers_git/helpers → wexample_helpers_git-7.0.0/src/wexample_helpers_git/helper}/git.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from wexample_helpers.classes.shell_result import ShellResult
-from wexample_helpers.helpers.shell import shell_run
+from wexample_helpers.helper.shell import shell_run
 
 if TYPE_CHECKING:
     from git import Remote, Repo
@@ -14,7 +14,7 @@ def git_checkout_new_branch(
     branch: str, *, cwd: FileStringOrPath, inherit_stdio: bool = True
 ) -> None:
     """Create and switch to a new branch using `git checkout -b <branch>` (compat)."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     shell_run(
         ["git", "checkout", "-b", branch],
@@ -27,7 +27,7 @@ def git_commit_all_with_message(
     message: str, *, cwd: FileStringOrPath, inherit_stdio: bool = True
 ) -> None:
     """Stage all changes (including new files) and commit with the provided message."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     resolved = file_resolve_path(cwd)
     git_run(["add", "-A"], inherit_stdio=inherit_stdio, cwd=resolved)
@@ -55,7 +55,7 @@ def git_create_or_switch_branch(
 
 def git_current_branch(*, cwd: FileStringOrPath, inherit_stdio: bool = False) -> str:
     """Return the current branch name."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     return shell_run(
         ["git", "rev-parse", "--abbrev-ref", "HEAD"],
@@ -74,7 +74,7 @@ def git_ensure_upstream(
 
     Returns the upstream (e.g., "origin/main").
     """
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     cwd_resolved = file_resolve_path(cwd)
     branch = git_current_branch(cwd=cwd_resolved, inherit_stdio=False)
@@ -114,7 +114,7 @@ def git_get_changed_paths(*, cwd: FileStringOrPath) -> set[str]:
     """
     from pathlib import Path
 
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     cwd_path = Path(file_resolve_path(cwd))
 
@@ -154,7 +154,7 @@ def git_get_changed_paths(*, cwd: FileStringOrPath) -> set[str]:
 
 def git_get_current_commit_hash(*, cwd: FileStringOrPath, short: bool = False) -> str:
     """Return the current commit hash (full or short)."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     cmd = ["git", "rev-parse"]
     if short:
@@ -168,7 +168,7 @@ def git_get_current_commit_hash(*, cwd: FileStringOrPath, short: bool = False) -
 
 def git_get_remote_url(remote: str = "origin", *, cwd: FileStringOrPath) -> str:
     """Return the fetch URL of the given remote."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     return git_run(
         ["remote", "get-url", remote],
@@ -179,7 +179,7 @@ def git_get_remote_url(remote: str = "origin", *, cwd: FileStringOrPath) -> str:
 
 def git_get_upstream(*, cwd: FileStringOrPath, inherit_stdio: bool = False) -> str:
     """Return the symbolic upstream (e.g., origin/main) or empty string if none is set."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     try:
         return shell_run(
@@ -198,7 +198,7 @@ def git_has_changes_since_tag(
 
     Runs: git diff --quiet <tag> -- <pathspec> || echo CHANGED
     """
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     out = shell_run(
         [
@@ -214,7 +214,7 @@ def git_has_changes_since_tag(
 
 def git_has_index_changes(*, cwd: FileStringOrPath) -> bool:
     """Return True if there are staged (indexed) changes."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     # Always capture output here regardless of inherit_stdio so we can safely read stdout.
     out = shell_run(
@@ -232,7 +232,7 @@ def git_has_uncommitted_changes(*, cwd: FileStringOrPath) -> bool:
 
 def git_has_working_changes(*, cwd: FileStringOrPath) -> bool:
     """Return True if there are unstaged changes in tracked files."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     # Always capture output here regardless of inherit_stdio so we can safely read stdout.
     # When inherit_stdio=True, stdout would be None and .strip() would fail.
@@ -246,7 +246,7 @@ def git_has_working_changes(*, cwd: FileStringOrPath) -> bool:
 
 def git_is_init(path: FileStringOrPath) -> bool:
     from git import InvalidGitRepositoryError, Repo
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     path = file_resolve_path(path)
 
@@ -267,7 +267,7 @@ def git_last_tag_for_prefix(
 
     Returns None if no tag matches.
     """
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     out = shell_run(
         [
@@ -285,7 +285,7 @@ def git_pull_rebase_autostash(
     *, cwd: FileStringOrPath, inherit_stdio: bool = True
 ) -> None:
     """Pull latest changes with rebase and autostash to preserve local modifications."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     git_run(
         ["pull", "--rebase", "--autostash"],
@@ -308,7 +308,7 @@ def git_push_follow_tags(
 
     - If upstream is missing, uses `git push -u` which will create the remote branch if needed.
     """
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     cwd = file_resolve_path(cwd)
 
@@ -386,7 +386,7 @@ def git_push_tag(
     inherit_stdio: bool = True,
 ) -> ShellResult:
     """Push a specific tag to the remote."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     cmd = ["push"]
     if force:
@@ -425,7 +425,7 @@ def git_set_upstream(
     inherit_stdio: bool = True,
 ) -> None:
     """Set the upstream of the current branch to remote/branch."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     shell_run(
         [
@@ -444,7 +444,7 @@ def git_switch_branch(
     branch: str, *, cwd: FileStringOrPath, inherit_stdio: bool = True
 ) -> None:
     """Switch to an existing branch using `git switch <branch>`."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     shell_run(
         ["git", "switch", branch],
@@ -458,7 +458,7 @@ def git_switch_new_branch(
     branch: str, *, cwd: FileStringOrPath, inherit_stdio: bool = True
 ) -> None:
     """Create and switch to a new branch using `git switch -c <branch>`."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     shell_run(
         ["git", "switch", "-c", branch],
@@ -471,7 +471,7 @@ def git_tag_annotated(
     tag: str, message: str, *, cwd: FileStringOrPath, inherit_stdio: bool = True
 ) -> None:
     """Create an annotated tag. Raises if the tag already exists."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     shell_run(
         ["git", "tag", "-a", tag, "-m", message],
@@ -484,7 +484,7 @@ def git_tag_exists(
     tag: str, *, cwd: FileStringOrPath, inherit_stdio: bool = False
 ) -> bool:
     """Return True if a tag with the given name exists locally."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     try:
         out = shell_run(
@@ -501,7 +501,7 @@ def git_tag_lightweight(
     tag: str, *, cwd: FileStringOrPath, force: bool = False, inherit_stdio: bool = True
 ) -> None:
     """Create (or force-update) a lightweight tag at HEAD."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     cmd = ["tag"]
     if force:
@@ -512,7 +512,7 @@ def git_tag_lightweight(
 
 def git_tag_points_to_head(tag: str, *, cwd: FileStringOrPath) -> bool:
     """Return True if the given tag resolves to the same commit as HEAD."""
-    from wexample_helpers.helpers.file import file_resolve_path
+    from wexample_helpers.helper.file import file_resolve_path
 
     try:
         tag_hash = shell_run(

{wexample_helpers_git-6.11.2/src/wexample_helpers_git/helpers → wexample_helpers_git-7.0.0/src/wexample_helpers_git/helper}/git_retryable_callback_manager.py

@@ -4,7 +4,7 @@ from collections.abc import Iterable
 from typing import TypeVar
 
 from wexample_helpers.decorator.base_class import base_class
-from wexample_helpers.helpers.retryable_callback_manager import (
+from wexample_helpers.helper.retryable_callback_manager import (
     RetryableCallbackManager,
 )
 

{wexample_helpers_git-6.11.2/src/wexample_helpers_git/helpers → wexample_helpers_git-7.0.0/src/wexample_helpers_git/helper}/repo.py

@@ -9,7 +9,7 @@ STATE_FILE = Path(".last_git_state")
 
 def repo_get_state(cwd: PathOrString | None = None) -> str:
     """Return a unique hash representing the current git state (HEAD + changes)."""
-    from wexample_helpers_git.helpers.git import git_run
+    from wexample_helpers_git.helper.git import git_run
 
     head_result = git_run(["rev-parse", "HEAD"], cwd=cwd)
     head_hash = head_result.stdout.strip() if head_result.stdout else ""

{wexample_helpers_git-6.11.2/tests/helpers → wexample_helpers_git-7.0.0/tests/helper}/test_helper_git.py

@@ -27,7 +27,7 @@ def temp_dir(tmp_path: Path) -> Generator[Path]:
 
 
 def test_git_is_init(temp_dir: Path, git_repo: Repo) -> None:
-    from wexample_helpers_git.helpers.git import git_is_init
+    from wexample_helpers_git.helper.git import git_is_init
 
     # Test with initialized repository
     assert git_is_init(temp_dir) is True
@@ -43,7 +43,7 @@ def test_git_is_init(temp_dir: Path, git_repo: Repo) -> None:
 
 
 def test_git_remote_create_once(git_repo: Repo) -> None:
-    from wexample_helpers_git.helpers.git import git_remote_create_once
+    from wexample_helpers_git.helper.git import git_remote_create_once
 
     remote_name = "origin"
     remote_url = "https://github.com/test/repo.git"

{wexample_helpers_git-6.11.2/tests/helpers → wexample_helpers_git-7.0.0/tests/helper}/test_repo.py

@@ -26,7 +26,7 @@ def git_repo(tmp_path: Path) -> Path:
 
 
 def test_repo_get_state_changes_with_working_tree(git_repo: Path) -> None:
-    from wexample_helpers_git.helpers.repo import repo_get_state
+    from wexample_helpers_git.helper.repo import repo_get_state
 
     before = repo_get_state(cwd=git_repo)
     (git_repo / "file.txt").write_text("modified")
@@ -35,7 +35,7 @@ def test_repo_get_state_changes_with_working_tree(git_repo: Path) -> None:
 
 
 def test_repo_get_state_returns_head_and_diff_hash(git_repo: Path) -> None:
-    from wexample_helpers_git.helpers.repo import repo_get_state
+    from wexample_helpers_git.helper.repo import repo_get_state
 
     state = repo_get_state(cwd=git_repo)
     assert "-" in state
@@ -45,7 +45,7 @@ def test_repo_get_state_returns_head_and_diff_hash(git_repo: Path) -> None:
 def test_repo_has_changed_false_on_second_unchanged_run(
     git_repo: Path, tmp_path: Path
 ) -> None:
-    from wexample_helpers_git.helpers.repo import repo_has_changed
+    from wexample_helpers_git.helper.repo import repo_has_changed
 
     state_file = tmp_path / "state"
     repo_has_changed(cwd=git_repo, state_file=state_file)
@@ -53,7 +53,7 @@ def test_repo_has_changed_false_on_second_unchanged_run(
 
 
 def test_repo_has_changed_since_detects_modification(git_repo: Path) -> None:
-    from wexample_helpers_git.helpers.repo import (
+    from wexample_helpers_git.helper.repo import (
         repo_get_state,
         repo_has_changed_since,
     )
@@ -65,7 +65,7 @@ def test_repo_has_changed_since_detects_modification(git_repo: Path) -> None:
 
 
 def test_repo_has_changed_true_on_first_run(git_repo: Path, tmp_path: Path) -> None:
-    from wexample_helpers_git.helpers.repo import repo_has_changed
+    from wexample_helpers_git.helper.repo import repo_has_changed
 
     state_file = tmp_path / "state"
     assert repo_has_changed(cwd=git_repo, state_file=state_file) is True