[OE-core][PATCH 1/3] python3-flit-core: upgrade 3.10.1 -> 3.11.0

[OE-core][PATCH 1/3] python3-flit-core: upgrade 3.10.1 -> 3.11.0

[Trevor Gamblin]

This update is required for latest versions of packages such as sphinx
to build with flit, otherwise you encounter errors like:

|   File "/home/tgamblin/workspace/yocto/poky/build/tmp/work/core2-64-poky-linux/python3-sphinx/8.2.1/recipe-sysroot-native/usr/lib/python3.13/site-packages/flit_core/config.py", line 444, in _check_type
|     raise ConfigError(
|         "{} field should be {}, not {}".format(field_name, cls, type(d[field_name]))
|     )
| flit_core.config.ConfigError: license field should be <class 'dict'>, not <class 'str'>
|
| ERROR Backend subprocess exited when trying to invoke get_requires_for_build_wheel

Changelog (https://github.com/pypa/flit/blob/main/doc/history.rst#version-311):

- Support for SPDX license expressions and multiple license files, as
  detailed in PEP 639:

    license = "BSD-3-Clause"
    license-files = ["LICENSE"]

  For now, only a single license identifier is allowed. More complex
  expressions describing multiple licenses & expressions may be
  supported in a future version.

- The metadata format in produced packages is now version 2.4, to
  support the expanded license information.

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
 ...{python3-flit-core_3.10.1.bb => python3-flit-core_3.11.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-flit-core_3.10.1.bb => python3-flit-core_3.11.0.bb} (91%)

diff --git a/meta/recipes-devtools/python/python3-flit-core_3.10.1.bb b/meta/recipes-devtools/python/python3-flit-core_3.11.0.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-flit-core_3.10.1.bb
rename to meta/recipes-devtools/python/python3-flit-core_3.11.0.bb
index 55f200a3ad7..1d44b58830e 100644
--- a/meta/recipes-devtools/python/python3-flit-core_3.10.1.bb
+++ b/meta/recipes-devtools/python/python3-flit-core_3.11.0.bb
@@ -8,7 +8,7 @@ BUGTRACKER = "https://github.com/pypa/flit/issues"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=41eb78fa8a872983a882c694a8305f08"
 
-SRC_URI[sha256sum] = "9c6258ae76d218ce60f9e39a43ca42006a3abcc5c44ea6bb2a1daa13857a8f1a"
+SRC_URI[sha256sum] = "58d0a07f684c315700c9c54a661a1130995798c3e495db0db53ce6e7d0121825"
 
 inherit pypi python_flit_core
 
-- 
2.39.5

[OE-core][PATCH 2/3] python3-sphinx: upgrade 8.1.3 -> 8.2.1

[Trevor Gamblin]

Changelog: https://www.sphinx-doc.org/en/master/changes/8.2.html

License-Update: Update copyright year

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
 .../{python3-sphinx_8.1.3.bb => python3-sphinx_8.2.1.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinx_8.1.3.bb => python3-sphinx_8.2.1.bb} (83%)

diff --git a/meta/recipes-devtools/python/python3-sphinx_8.1.3.bb b/meta/recipes-devtools/python/python3-sphinx_8.2.1.bb
similarity index 83%
rename from meta/recipes-devtools/python/python3-sphinx_8.1.3.bb
rename to meta/recipes-devtools/python/python3-sphinx_8.2.1.bb
index 38cceb068a8..e22ab817e7e 100644
--- a/meta/recipes-devtools/python/python3-sphinx_8.1.3.bb
+++ b/meta/recipes-devtools/python/python3-sphinx_8.2.1.bb
@@ -2,9 +2,9 @@ SUMMARY = "Python documentation generator"
 HOMEPAGE = "http://sphinx-doc.org/"
 SECTION = "devel/python"
 LICENSE = "BSD-2-Clause & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=4ab44940eeb9c0ec044da326d904a683"
+LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=e30c37a2b7fb0afa3adc0d72b85e8b04"
 
-SRC_URI[sha256sum] = "43c1911eecb0d3e161ad78611bc905d1ad0e523e4ddc202a58a821773dc4c927"
+SRC_URI[sha256sum] = "e4b932951b9c18b039f73b72e4e63afe967d90408700ec222b981ac24647c01e"
 
 inherit python_flit_core pypi
 
-- 
2.39.5

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

[Trevor Gamblin]

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 --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}"
-- 
2.39.5

Re: [OE-core][PATCH 2/3] python3-sphinx: upgrade 8.1.3 -> 8.2.1

[Mathieu Dubois-Briand]

On Wed Feb 26, 2025 at 3:54 AM CET, Trevor Gamblin wrote:
> Changelog: https://www.sphinx-doc.org/en/master/changes/8.2.html
>
> License-Update: Update copyright year
>
> Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
> ---

Hi Trevor,

Thanks for your patch.

I believe this is breaking the btrfs build, we get the following error
on the autobuilder:

ERROR: btrfs-tools-6.12-r0 do_compile: oe_runmake failed
ERROR: btrfs-tools-6.12-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-83385/tmp/work/core2-64-poky-linux/btrfs-tools/6.12/temp/run.do_compile.1523080' failed with exit code 1
ERROR: Logfile of failure stored in: /srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-83385/tmp/work/core2-64-poky-linux/btrfs-tools/6.12/temp/log.do_compile.1523080
Log data follows:
| DEBUG: Executing shell function do_compile
...
| Traceback
| =========
|
|       File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-83385/tmp/work/core2-64-poky-linux/btrfs-tools/6.12/recipe-sysroot-native/usr/lib/python3.13/site-packages/sphinx/registry.py", line 544, in load_extension
|         raise ExtensionError(
|             __('Could not import extension %s') % extname, err
|         ) from err
|     sphinx.errors.ExtensionError: Could not import extension sphinx.builders.latex (exception: No module named 'roman_numerals')
|

https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/997

Can you have a look at this issue please?

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com