diff options
| author | Trevor Gamblin <tgamblin@baylibre.com> | 2025-02-25 21:54:37 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-02-27 10:55:17 +0000 |
| commit | a8f507ba6c27cb100df76edcaa21497dd92c5acd (patch) | |
| tree | ac899b545b271a2bc746b5a8b8b2ed7619ff564f /meta/recipes-devtools/python/python3-setuptools-scm | |
| parent | ee3bd7405df7b78b263e79ca439b8fa6fed4e4be (diff) | |
| download | poky-a8f507ba6c27cb100df76edcaa21497dd92c5acd.tar.gz | |
python3-setuptools-scm: upgrade 8.1.0 -> 8.2.0
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
(From OE-Core rev: 6bab759c00b44fc2793e095f991975b7eebf360f)
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3-setuptools-scm')
| -rw-r--r-- | meta/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch | 36 |
1 files changed, 0 insertions, 36 deletions
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 7d2808cc0c..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From a1cc419a118560d63e1ab8838c256a3622185750 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Etienne Cordonnier <ecordonnier@snap.com> | ||
| 3 | Date: Thu, 13 Feb 2025 15:44:40 +0100 | ||
| 4 | Subject: [PATCH] respect GIT_CEILING_DIRECTORIES | ||
| 5 | |||
| 6 | Fix for https://github.com/pypa/setuptools-scm/issues/1103 | ||
| 7 | |||
| 8 | When searching for the root-directory of the git repository e.g. with git rev-parse --show-toplevel, | ||
| 9 | git stops the search when reaching $GIT_CEILING_DIRECTORIES. By ignoring this variable, the function | ||
| 10 | _git_toplevel can go above the real git repository (e.g. when packaging a tarball without .git repository), | ||
| 11 | and then runs "git archive" on an unrelated git repository. | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | |||
| 15 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 16 | Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> | ||
| 17 | --- | ||
| 18 | src/setuptools_scm/_run_cmd.py | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/src/setuptools_scm/_run_cmd.py b/src/setuptools_scm/_run_cmd.py | ||
| 22 | index f2a8285..7e13d9f 100644 | ||
| 23 | --- a/src/setuptools_scm/_run_cmd.py | ||
| 24 | +++ b/src/setuptools_scm/_run_cmd.py | ||
| 25 | @@ -98,7 +98,7 @@ def no_git_env(env: Mapping[str, str]) -> dict[str, str]: | ||
| 26 | k: v | ||
| 27 | for k, v in env.items() | ||
| 28 | if not k.startswith("GIT_") | ||
| 29 | - or k in ("GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND") | ||
| 30 | + or k in ("GIT_CEILING_DIRECTORIES", "GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND") | ||
| 31 | } | ||
| 32 | |||
| 33 | |||
| 34 | -- | ||
| 35 | 2.43.0 | ||
| 36 | |||
