setuptools-git-versioning 3.2.0__py3-none-any.whl → 3.2.1__py3-none-any.whl

setuptools_git_versioning/archival.py

@@ -25,8 +25,8 @@ if TYPE_CHECKING:
 ARCHIVAL_FILENAME = ".git_archival.txt"
 DESCRIBE_UNSUPPORTED = "%(describe"
 FORMAT_UNSUBSTITUTED = "$Format"
-DESCRIBE_PARTS = 3  # tag-N-gSHA
 
+DESCRIBE_RE = re.compile(r"^(?P<tag>.+)-(?P<ccount>[0-9]+)-g(?P<sha>[0-9a-f]+)$")  # tag-N-gSHA
 REF_TAG_RE = re.compile(r"(?<=\btag: )([^,]+)\b")
 REF_HEAD_RE = re.compile(r"HEAD\s*->\s*([^,]+)")
 FULL_SHA_RE = re.compile(r"^([0-9a-f]{40}|[0-9a-f]{64})$")  # SHA-1 or SHA-256
@@ -74,18 +74,14 @@ def _parse_describe(describe: str) -> tuple[str, int, str | None, bool]:
         dirty = True
         describe = describe[: -len("-dirty")]
 
-    parts = describe.rsplit("-", 2)
-    if len(parts) < DESCRIBE_PARTS:
+    # On a tagged commit, `git describe` prints the bare tag. Only split off
+    # the suffix when it really is `-N-gSHA`, so that tags like `2024-01-15`
+    # are not mistaken for a tag followed by a commit count and a SHA.
+    match = DESCRIBE_RE.match(describe)
+    if not match:
         return describe, 0, None, dirty
 
-    tag, ccount_str, gnode = parts
-    try:
-        ccount = int(ccount_str)
-    except ValueError:
-        return describe, 0, None, dirty
-
-    short_sha = gnode[1:] if gnode.startswith("g") else gnode
-    return tag, ccount, short_sha, dirty
+    return match.group("tag"), int(match.group("ccount")), match.group("sha"), dirty
 
 
 def _branch_from_ref_names(ref_names: str) -> str | None:

{setuptools_git_versioning-3.2.0.dist-info → setuptools_git_versioning-3.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: setuptools-git-versioning
-Version: 3.2.0
+Version: 3.2.1
 Summary: Use git repo data for building a version number according to PEP-440
 Author-email: dolfinus <martinov.m.s.8@gmail.com>
 License: MIT
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst

{setuptools_git_versioning-3.2.0.dist-info → setuptools_git_versioning-3.2.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 setuptools_git_versioning/__init__.py,sha256=HBPrkDXm4rugE32DxfzvPZwFkZodvB9d1Pt4m9MwmNw,1003
 setuptools_git_versioning/__main__.py,sha256=6mSX6LsqmyKDEmobvZRfrxXO0kDuZH3aENzvxbunOtA,55
-setuptools_git_versioning/archival.py,sha256=A9udXlJFsLHv2Vk7U6CP_jyv816NwPD6hie_fkloLY8,7524
+setuptools_git_versioning/archival.py,sha256=9bjUs7H64e0y_heO2ldiHKfVRHRGcuuhakRULxsxZMY,7639
 setuptools_git_versioning/cli.py,sha256=DQ6_OFbKXUM30dnP0wWWJbAVjt5RIjxFxUw3sfdBtFs,1132
 setuptools_git_versioning/defaults.py,sha256=b6v4LbK8Js_WQmsqzSouP2eTgc1TAttkM6sD1i1gFCI,822
 setuptools_git_versioning/dynamic_metadata.py,sha256=IUNeuWpKmmjVDvB7yNY_8bTdCDaIw2DZM_Maty4twXM,1618
@@ -11,9 +11,9 @@ setuptools_git_versioning/scikit_metadata.py,sha256=9XeDmR163oBoEM8NtHpHNYmhT5Ei
 setuptools_git_versioning/setup.py,sha256=bQGeT96GFodgmemaOo19uuwyRiNIySleGDB1T46FQOY,5357
 setuptools_git_versioning/subst.py,sha256=thLbkXUmUvsZR84o1S7D5uXsYmK4xSldGGPBGQdwccM,2174
 setuptools_git_versioning/version.py,sha256=ZQtW-QolkWhc066V4wSwQ0tOhSRFb53xamzjs7uZMwg,9459
-setuptools_git_versioning-3.2.0.dist-info/licenses/LICENSE,sha256=YP7W0rZutEgY8ypJZeFLuZDSYsaZC-P6YxGZDjiFuL4,1060
-setuptools_git_versioning-3.2.0.dist-info/METADATA,sha256=pc4-IlDYGjHiIWXyZZy3hXoen9I8J1uF6RpkAAMc2n8,7066
-setuptools_git_versioning-3.2.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-setuptools_git_versioning-3.2.0.dist-info/entry_points.txt,sha256=e-Eyt_a42w9hc-6tjRpitRnP4TxvlLwelNPI5k-jdEA,405
-setuptools_git_versioning-3.2.0.dist-info/top_level.txt,sha256=aP9te4bjCBVXzZRQhwrT_IdcSxOe1Dd8Mb_oFCeNyEI,26
-setuptools_git_versioning-3.2.0.dist-info/RECORD,,
+setuptools_git_versioning-3.2.1.dist-info/licenses/LICENSE,sha256=YP7W0rZutEgY8ypJZeFLuZDSYsaZC-P6YxGZDjiFuL4,1060
+setuptools_git_versioning-3.2.1.dist-info/METADATA,sha256=Bp_jmVj6ygT8TIBuoXpqQ3u8hes4oyD3wTvCmwocN0k,7117
+setuptools_git_versioning-3.2.1.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+setuptools_git_versioning-3.2.1.dist-info/entry_points.txt,sha256=e-Eyt_a42w9hc-6tjRpitRnP4TxvlLwelNPI5k-jdEA,405
+setuptools_git_versioning-3.2.1.dist-info/top_level.txt,sha256=aP9te4bjCBVXzZRQhwrT_IdcSxOe1Dd8Mb_oFCeNyEI,26
+setuptools_git_versioning-3.2.1.dist-info/RECORD,,

{setuptools_git_versioning-3.2.0.dist-info → setuptools_git_versioning-3.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (84.0.0)
+Generator: setuptools (84.2.1)
 Root-Is-Purelib: true
 Tag: py3-none-any