vcs-versioning 2.2.2__tar.gz → 2.2.3__tar.gz

{vcs_versioning-2.2.2 → vcs_versioning-2.2.3}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!-- towncrier release notes start -->
 
+## 2.2.3 (2026-07-28)
+
+### Fixed
+
+- Fix `ValueError` when parsing `.git_archival.txt` of a tagged commit whose tag contains more than one dash (e.g. `llvmorg-23.1.0-rc2`) - the `git describe` suffix is now matched precisely instead of splitting on the last two dashes. ([#1481](https://github.com/pypa/setuptools-scm/issues/1481))
+
 ## 2.2.2 (2026-06-29)
 
 ### Fixed

{vcs_versioning-2.2.2/src/vcs_versioning.egg-info → vcs_versioning-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vcs-versioning
-Version: 2.2.2
+Version: 2.2.3
 Summary: the blessed package to manage your versions by vcs metadata
 Author-email: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
 License: MIT
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: packaging>=20
+Requires-Dist: packaging>=26.2
 Requires-Dist: tomli>=1; python_version < "3.11"
 Requires-Dist: typing-extensions>=4.1; python_version < "3.11"
 Dynamic: license-file

{vcs_versioning-2.2.2 → vcs_versioning-2.2.3}/pyproject.toml

@@ -7,7 +7,7 @@
 build-backend = "setuptools.build_meta"
 requires = [
   "setuptools>=45",
-  "packaging>=20",
+  "packaging>=26.2",
   'typing-extensions>=4.1; python_version < "3.11"',
 ]
 
@@ -38,7 +38,7 @@ dynamic = [
   "version",
 ]
 dependencies = [
-  "packaging>=20",
+  "packaging>=26.2",
   'tomli>=1; python_version < "3.11"',
   'typing-extensions>=4.1; python_version < "3.11"',
 ]

{vcs_versioning-2.2.2 → vcs_versioning-2.2.3}/src/vcs_versioning/_backends/_git.py

@@ -33,6 +33,11 @@ log = logging.getLogger(__name__)
 REF_TAG_RE = re.compile(r"(?<=\btag: )([^,]+)\b")
 DESCRIBE_UNSUPPORTED = "%(describe"
 
+# ``git describe`` appends ``-<distance>-g<abbreviated node>`` to the tag name.
+# Tags may contain dashes themselves, so the suffix has to be matched precisely
+# instead of just splitting on the last two dashes.
+DESCRIBE_SUFFIX_RE = re.compile(r"^(?P<tag>.+)-(?P<distance>\d+)-g(?P<node>[0-9a-f]+)$")
+
 
 # If testing command in shell make sure to quote the match argument like
 # '*[0-9]*' as it will expand before being sent to git if there are any matching
@@ -473,15 +478,15 @@ def _git_parse_describe(
     else:
         dirty = False
 
-    split = describe_output.rsplit("-", 2)
-    if len(split) < 3:  # probably a tagged commit
-        tag = describe_output
-        number = 0
-        node = None
-    else:
-        tag, number_, node = split
-        number = int(number_)
-    return tag, number, node, dirty
+    match = DESCRIBE_SUFFIX_RE.match(describe_output)
+    if match is None:  # probably a tagged commit
+        return describe_output, 0, None, dirty
+    return (
+        match.group("tag"),
+        int(match.group("distance")),
+        "g" + match.group("node"),
+        dirty,
+    )
 
 
 def archival_to_version(

{vcs_versioning-2.2.2 → vcs_versioning-2.2.3/src/vcs_versioning.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vcs-versioning
-Version: 2.2.2
+Version: 2.2.3
 Summary: the blessed package to manage your versions by vcs metadata
 Author-email: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
 License: MIT
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: packaging>=20
+Requires-Dist: packaging>=26.2
 Requires-Dist: tomli>=1; python_version < "3.11"
 Requires-Dist: typing-extensions>=4.1; python_version < "3.11"
 Dynamic: license-file

{vcs_versioning-2.2.2 → vcs_versioning-2.2.3}/src/vcs_versioning.egg-info/requires.txt

@@ -1,4 +1,4 @@
-packaging>=20
+packaging>=26.2
 
 [:python_version < "3.11"]
 tomli>=1

{vcs_versioning-2.2.2 → vcs_versioning-2.2.3}/testing_vcs/test_git.py

@@ -50,10 +50,15 @@ def wd(wd: WorkDir, monkeypatch: pytest.MonkeyPatch, debug_mode: DebugMode) -> W
     [
         ("3.3.1-rc26-0-g9df187b", "3.3.1-rc26", 0, "g9df187b", False),
         ("17.33.0-rc-17-g38c3047c0", "17.33.0-rc", 17, "g38c3047c0", False),
+        ("v1.15.1rc1-37-g9bd1298-dirty", "v1.15.1rc1", 37, "g9bd1298", True),
+        # bare tags containing dashes must not be mistaken for describe output
+        ("llvmorg-23.1.0-rc2", "llvmorg-23.1.0-rc2", 0, None, False),
+        ("llvmorg-23.1.0-rc2-dirty", "llvmorg-23.1.0-rc2", 0, None, True),
+        ("release-1.2.2", "release-1.2.2", 0, None, False),
     ],
 )
 def test_parse_describe_output(
-    given: str, tag: str, number: int, node: str, dirty: bool
+    given: str, tag: str, number: int, node: str | None, dirty: bool
 ) -> None:
     parsed = _git._git_parse_describe(given)
     assert parsed == (tag, number, node, dirty)
@@ -650,6 +655,18 @@ def test_git_archival_to_version(expected: str, from_data: dict[str, str]) -> No
     assert format_version(version) == expected
 
 
+@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/1481")
+def test_git_archival_bare_tag_with_dashes() -> None:
+    config = Configuration(tag_regex=r"^llvmorg-(?P<version>.+)$")
+    version = archival_to_version(
+        {"describe-name": "llvmorg-23.1.0-rc2"}, config=config
+    )
+    assert version is not None
+    assert str(version.tag) == "23.1.0rc2"
+    assert version.distance == 0
+    assert version.node is None
+
+
 @pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/727")
 def test_git_archival_node_missing_no_version() -> None:
     config = Configuration()

{vcs_versioning-2.2.2 → vcs_versioning-2.2.3}/uv.lock

@@ -317,7 +317,7 @@ test = [
 
 [package.metadata]
 requires-dist = [
-    { name = "packaging", specifier = ">=20" },
+    { name = "packaging", specifier = ">=26.2" },
     { name = "tomli", marker = "python_full_version < '3.11'", specifier = ">=1" },
     { name = "typing-extensions", marker = "python_full_version < '3.11'", specifier = ">=4.1" },
 ]