Skip to content
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
5 changes: 5 additions & 0 deletions src/scribae/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ def _resolve_version() -> str:
resolved = _version_from_pyproject()
git_suffix = _git_description()
if git_suffix:
tag_prefix = f"v{resolved}"
if git_suffix.startswith(f"{tag_prefix}-"):
git_suffix = git_suffix[len(tag_prefix) + 1 :]
elif git_suffix == tag_prefix:
return resolved
return f"{resolved}-{git_suffix}"
return resolved

Expand Down
14 changes: 14 additions & 0 deletions tests/unit/version_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
from _pytest.monkeypatch import MonkeyPatch

import scribae as scribae_init


def test_resolve_version_strips_duplicate_git_tag(monkeypatch: MonkeyPatch) -> None:
monkeypatch.setattr(scribae_init, "version", lambda _: "0.1.0")
monkeypatch.setattr(
scribae_init,
"_git_description",
lambda: "v0.1.0-13-gcfeefb2-dirty",
)

assert scribae_init._resolve_version() == "0.1.0-13-gcfeefb2-dirty"