summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/python/python3-pylint/0002-pyproject.toml-Keep-tool.setuptools.license-files.patch48
-rw-r--r--meta-python/recipes-devtools/python/python3-pylint_3.3.6.bb (renamed from meta-python/recipes-devtools/python/python3-pylint_3.3.4.bb)5
2 files changed, 51 insertions, 2 deletions
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 @@
1From 2a08adb0e90219626dac0b6d05a21265e460eae2 Mon Sep 17 00:00:00 2001
2From: Leon Anavi <leon.anavi@konsulko.com>
3Date: Thu, 20 Mar 2025 12:09:42 +0000
4Subject: [PATCH] pyproject.toml: Keep tool.setuptools.license-files
5
6Keep legacy license declaration and tool.setuptools.license-files
7to avoid the following errors:
8
9| ValueError: invalid pyproject.toml config: `project.license`.
10| configuration error: `project.license` must be valid exactly by one definition (2 matches found):
11
12| ValueError: invalid pyproject.toml config: `project`.
13| configuration error: `project` must not contain {'license-files'} properties
14
15Upstream-Status: Inappropriate
16
17Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
18---
19 pyproject.toml | 6 ++++--
20 1 file changed, 4 insertions(+), 2 deletions(-)
21
22diff --git a/pyproject.toml b/pyproject.toml
23index 0cf1ade57..7a4665ce0 100644
24--- a/pyproject.toml
25+++ b/pyproject.toml
26@@ -8,8 +8,7 @@ name = "pylint"
27 description = "python code static checker"
28 readme = "README.rst"
29 keywords = [ "lint", "linter", "python", "static code analysis" ]
30-license = "GPL-2.0-or-later"
31-license-files = [ "LICENSE", "CONTRIBUTORS.txt" ]
32+license = { text = "GPL-2.0-or-later" }
33 authors = [
34 { name = "Python Code Quality Authority", email = "code-quality@python.org" },
35 ]
36@@ -65,6 +64,9 @@ scripts.pylint-config = "pylint:_run_pylint_config"
37 scripts.pyreverse = "pylint:run_pyreverse"
38 scripts.symilar = "pylint:run_symilar"
39
40+[tool.setuptools]
41+license-files = [ "LICENSE", "CONTRIBUTORS.txt" ]
42+
43 [tool.setuptools.packages.find]
44 include = [ "pylint*" ]
45
46--
472.39.5
48
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
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/"
3LICENSE = "GPL-2.0-only" 3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9"
5 5
6SRCREV = "c2b01c3d0b6410d4c93eb1f32fb28f2116b1e68f" 6SRCREV = "7ac5a4d4f77576df3a00e63f86ca86e0e1780b47"
7SRC_URI += "git://github.com/pylint-dev/pylint;branch=main;protocol=https \ 7SRC_URI += "git://github.com/pylint-dev/pylint;branch=maintenance/3.3.x;protocol=https \
8 file://0001-Adjust-test-expectations-for-ptest.patch \ 8 file://0001-Adjust-test-expectations-for-ptest.patch \
9 file://0002-pyproject.toml-Keep-tool.setuptools.license-files.patch \
9 file://run-ptest \ 10 file://run-ptest \
10 " 11 "
11 12