diff mbox series

[14/20] python3-vcs-versioning: upgrade 2.4.0 -> 2.4.1

Message ID 20260921070656.521680-14-richard.purdie@linuxfoundation.org
State New
Headers show
Series [01/20] ffmpeg: upgrade 9.0.1 -> 9.0.2 | expand

Commit Message

Richard Purdie Sept. 21, 2026, 7:06 a.m. UTC
- The error raised when a `.jj/` directory is found but `jj` is not installed now names the environment
  variables that actually disable jj discovery (`SETUPTOOLS_SCM_DISABLE_JJ=1` / `VCS_VERSIONING_DISABLE_JJ=1`)
  instead of an unprefixed `DISABLE_JJ=1`, which was never read.

- The "unable to detect version" error now names the environment variables the
  running integration actually reads. It previously suggested
  `SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${NORMALIZED_DIST_NAME}` unconditionally,
  which is not read by `vcs-versioning` on its own (or by any other integrator),
  and it named setuptools-scm as the failing tool regardless of which one ran.

  When the distribution name is known the suggested variable is spelled out in
  full. When it is not, the generic variables are suggested instead, with a note
  that the per-distribution `..._FOR_<DIST>` form needs a dist name to match --
  the previous message offered a `${NORMALIZED_DIST_NAME}` template that could
  never be filled in. ([#1539](https://github.com/pypa/setuptools-scm/issues/1539))

- Warn when file discovery is suppressed while a VCS marker sits in the
  project directory. `scm_search_known_failed()` means an integrator already
  looked and found no checkout, so a `.git`, `.hg` or `.jj` right there
  contradicts it and the artifact is about to lose every tracked file. That
  combination was the signature of the pretend-version regression and stayed
  invisible for three releases. Parent directories are not searched, since an
  unpacked sdist inside an unrelated checkout is the case the suppression
  exists for, and roots listed in `IGNORE_VCS_ROOTS` are skipped.

- Environment variable names are now built in one place (`env_var_name` /
  `EnvReader.candidate_names`), shared by the lookup in `EnvReader.read` and by
  every error message that suggests a variable, so a message cannot name a
  variable the lookup would not honour.

  The "repository found in a parent directory" error no longer offers a
  `get_version(relative_to=...)` call to integrators that do not ship one; the
  remaining options are renumbered instead.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...-vcs-versioning_2.4.0.bb => python3-vcs-versioning_2.4.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-vcs-versioning_2.4.0.bb => python3-vcs-versioning_2.4.1.bb} (91%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3-vcs-versioning_2.4.0.bb b/meta/recipes-devtools/python/python3-vcs-versioning_2.4.1.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-vcs-versioning_2.4.0.bb
rename to meta/recipes-devtools/python/python3-vcs-versioning_2.4.1.bb
index e66a7ce7b03..36bb2856a0b 100644
--- a/meta/recipes-devtools/python/python3-vcs-versioning_2.4.0.bb
+++ b/meta/recipes-devtools/python/python3-vcs-versioning_2.4.1.bb
@@ -5,7 +5,7 @@  library that can be used independently of setuptools."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c9b06ad2ebd7e2e82d34b3caf353e7d5"
 
-SRC_URI[sha256sum] = "cc4b66c02ae4cfb51e843910024f7142464c3391bb1f7e04608578b45046891b"
+SRC_URI[sha256sum] = "d4575de3115ec9434393c87c80ffb0eb98a16056bfe2b11ce0f3a97aff67fe0a"
 
 SRC_URI += "\
     file://run-ptest \