diff --git a/meta-python/recipes-devtools/python/python3-pylint/0002-pyproject.toml-Keep-tool.setuptools.license-files.patch b/meta-python/recipes-devtools/python/python3-pylint/0002-pyproject.toml-Keep-tool.setuptools.license-files.patch new file mode 100644 index 0000000000..28ed0c8951 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pylint/0002-pyproject.toml-Keep-tool.setuptools.license-files.patch @@ -0,0 +1,48 @@ +From 2a08adb0e90219626dac0b6d05a21265e460eae2 Mon Sep 17 00:00:00 2001 +From: Leon Anavi +Date: Thu, 20 Mar 2025 12:09:42 +0000 +Subject: [PATCH] pyproject.toml: Keep tool.setuptools.license-files + +Keep legacy license declaration and tool.setuptools.license-files +to avoid the following errors: + +| ValueError: invalid pyproject.toml config: `project.license`. +| configuration error: `project.license` must be valid exactly by one definition (2 matches found): + +| ValueError: invalid pyproject.toml config: `project`. +| configuration error: `project` must not contain {'license-files'} properties + +Upstream-Status: Inappropriate + +Signed-off-by: Leon Anavi +--- + pyproject.toml | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 0cf1ade57..7a4665ce0 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -8,8 +8,7 @@ name = "pylint" + description = "python code static checker" + readme = "README.rst" + keywords = [ "lint", "linter", "python", "static code analysis" ] +-license = "GPL-2.0-or-later" +-license-files = [ "LICENSE", "CONTRIBUTORS.txt" ] ++license = { text = "GPL-2.0-or-later" } + authors = [ + { name = "Python Code Quality Authority", email = "code-quality@python.org" }, + ] +@@ -65,6 +64,9 @@ scripts.pylint-config = "pylint:_run_pylint_config" + scripts.pyreverse = "pylint:run_pyreverse" + scripts.symilar = "pylint:run_symilar" + ++[tool.setuptools] ++license-files = [ "LICENSE", "CONTRIBUTORS.txt" ] ++ + [tool.setuptools.packages.find] + include = [ "pylint*" ] + +-- +2.39.5 + diff --git a/meta-python/recipes-devtools/python/python3-pylint_3.3.4.bb b/meta-python/recipes-devtools/python/python3-pylint_3.3.6.bb similarity index 88% rename from meta-python/recipes-devtools/python/python3-pylint_3.3.4.bb rename to meta-python/recipes-devtools/python/python3-pylint_3.3.6.bb index 92378d7fda..f70049c898 100644 --- a/meta-python/recipes-devtools/python/python3-pylint_3.3.4.bb +++ b/meta-python/recipes-devtools/python/python3-pylint_3.3.6.bb @@ -3,9 +3,10 @@ HOMEPAGE = "http://www.pylint.org/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" -SRCREV = "c2b01c3d0b6410d4c93eb1f32fb28f2116b1e68f" -SRC_URI += "git://github.com/pylint-dev/pylint;branch=main;protocol=https \ +SRCREV = "7ac5a4d4f77576df3a00e63f86ca86e0e1780b47" +SRC_URI += "git://github.com/pylint-dev/pylint;branch=maintenance/3.3.x;protocol=https \ file://0001-Adjust-test-expectations-for-ptest.patch \ + file://0002-pyproject.toml-Keep-tool.setuptools.license-files.patch \ file://run-ptest \ "