Merge branch 'fix-versioneer-escape-windows' into gold/2021

This picks up the fix #784
IntelPython · Feb 28, 2022 · 9815a7e · 9815a7e
2 parents 0690d49 + 78f6369
commit 9815a7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/dpctl/tests/test_service.py b/dpctl/tests/test_service.py
@@ -100,6 +100,7 @@ def test___version__():
     dpctl_ver = getattr(dpctl, "__version__", None)
     assert type(dpctl_ver) is str
     assert "unknown" not in dpctl_ver
+    assert "untagged" not in dpctl_ver
     # Reg expr from PEP-440, relaxed to allow for semantic variant
     # 0.9.0dev0 allowed, vs. PEP-440 compliant 0.9.0.dev0
     reg_expr = (

diff --git a/versioneer.py b/versioneer.py
@@ -1165,7 +1165,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
     TAG_PREFIX_REGEX = "*"
     if sys.platform == "win32":
         GITS = ["git.cmd", "git.exe"]
-        TAG_PREFIX_REGEX = r"\*"
+        TAG_PREFIX_REGEX = r"*"  # r"\*"  - using escape on windows breaks tag extraction
 
     _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root,
                    hide_stderr=True)