diff mbox series

[3/3] python3-setuptools-scm: upgrade 8.1.0 -> 8.2.0

Message ID 20250226025437.2042320-3-tgamblin@baylibre.com
State Accepted, archived
Commit 6bab759c00b44fc2793e095f991975b7eebf360f
Headers show
Series [1/3] python3-flit-core: upgrade 3.10.1 -> 3.11.0 | expand

Commit Message

Trevor Gamblin Feb. 26, 2025, 2:54 a.m. UTC 
Patch '0001-respect-GIT_CEILING_DIRECTORIES.patch' is no longer required
as it's upstream in 979d79301da6.

Changelog (https://github.com/pypa/setuptools-scm/blob/main/CHANGELOG.md):

Added
    - fix #960: add a --force-write-version-files flag for the cli

Changed
    - fix #950: ensure to pass encodings to io usage
    - fix #957: add subprocess timeout control env var
    - add sp-repo-review pre-commit hook

Fixed
    - fix #1018: allow non-normalized versions for semver
    - fix #1103: respect GIT_CEILING_DIRECTORIES when trying to find git toplevels
    - fix #1081: add name normalized pipx entrypoint
    - fix #1080: clean pdm from PYTHONPATH to protect mercurial

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
 ...0001-respect-GIT_CEILING_DIRECTORIES.patch | 36 -------------------
 ...1.0.bb => python3-setuptools-scm_8.2.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch
 rename meta/recipes-devtools/python/{python3-setuptools-scm_8.1.0.bb => python3-setuptools-scm_8.2.0.bb} (84%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch b/meta/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch
deleted file mode 100644
index 7d2808cc0ce..00000000000
--- a/meta/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-From a1cc419a118560d63e1ab8838c256a3622185750 Mon Sep 17 00:00:00 2001
-From: Etienne Cordonnier <ecordonnier@snap.com>
-Date: Thu, 13 Feb 2025 15:44:40 +0100
-Subject: [PATCH] respect GIT_CEILING_DIRECTORIES
-
-Fix for https://github.com/pypa/setuptools-scm/issues/1103
-
-When searching for the root-directory of the git repository e.g. with git rev-parse --show-toplevel,
-git stops the search when reaching $GIT_CEILING_DIRECTORIES. By ignoring this variable, the function
-_git_toplevel can go above the real git repository (e.g. when packaging a tarball without .git repository),
-and then runs "git archive" on an unrelated git repository.
-
-Upstream-Status: Pending
-
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
----
- src/setuptools_scm/_run_cmd.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/setuptools_scm/_run_cmd.py b/src/setuptools_scm/_run_cmd.py
-index f2a8285..7e13d9f 100644
---- a/src/setuptools_scm/_run_cmd.py
-+++ b/src/setuptools_scm/_run_cmd.py
-@@ -98,7 +98,7 @@ def no_git_env(env: Mapping[str, str]) -> dict[str, str]:
-         k: v
-         for k, v in env.items()
-         if not k.startswith("GIT_")
--        or k in ("GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND")
-+        or k in ("GIT_CEILING_DIRECTORIES", "GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND")
-     }
- 
- 
--- 
-2.43.0
-
diff --git a/meta/recipes-devtools/python/python3-setuptools-scm_8.1.0.bb b/meta/recipes-devtools/python/python3-setuptools-scm_8.2.0.bb
similarity index 84%
rename from meta/recipes-devtools/python/python3-setuptools-scm_8.1.0.bb
rename to meta/recipes-devtools/python/python3-setuptools-scm_8.2.0.bb
index 14913ff958e..ecb79afe47b 100644
--- a/meta/recipes-devtools/python/python3-setuptools-scm_8.1.0.bb
+++ b/meta/recipes-devtools/python/python3-setuptools-scm_8.2.0.bb
@@ -6,8 +6,7 @@  argument or in a SCM managed file."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2"
 
-SRC_URI += "file://0001-respect-GIT_CEILING_DIRECTORIES.patch"
-SRC_URI[sha256sum] = "42dea1b65771cba93b7a515d65a65d8246e560768a66b9106a592c8e7f26c8a7"
+SRC_URI[sha256sum] = "a18396a1bc0219c974d1a74612b11f9dce0d5bd8b1dc55c65f6ac7fd609e8c28"
 
 PYPI_PACKAGE = "setuptools_scm"
 UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"