Skip to content

Commit 9815a7e

Browse files
Merge branch 'fix-versioneer-escape-windows' into gold/2021
This picks up the fix #784
2 parents 0690d49 + 78f6369 commit 9815a7e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

dpctl/tests/test_service.py

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ def test___version__():
100100
dpctl_ver = getattr(dpctl, "__version__", None)
101101
assert type(dpctl_ver) is str
102102
assert "unknown" not in dpctl_ver
103+
assert "untagged" not in dpctl_ver
103104
# Reg expr from PEP-440, relaxed to allow for semantic variant
104105
# 0.9.0dev0 allowed, vs. PEP-440 compliant 0.9.0.dev0
105106
reg_expr = (

versioneer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
11651165
TAG_PREFIX_REGEX = "*"
11661166
if sys.platform == "win32":
11671167
GITS = ["git.cmd", "git.exe"]
1168-
TAG_PREFIX_REGEX = r"\*"
1168+
TAG_PREFIX_REGEX = r"*" # r"\*" - using escape on windows breaks tag extraction
11691169

11701170
_, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root,
11711171
hide_stderr=True)

0 commit comments

Comments
 (0)