diff --git a/meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch b/meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch index 769cd145e1..46dbe39aef 100644 --- a/meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch +++ b/meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch @@ -1,4 +1,4 @@ -From f3a213cf4922c122e554277ea2031c0c54cd3fe5 Mon Sep 17 00:00:00 2001 +From b23f3031db65e6e98826639755e26f4b169f9e52 Mon Sep 17 00:00:00 2001 From: Dan McGregor Date: Wed, 13 Mar 2024 14:08:25 -0600 Subject: [PATCH] Adjust test expectations for ptest @@ -12,9 +12,11 @@ Signed-off-by: Dan McGregor tests/functional/w/wrong_import_order.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) +diff --git a/tests/functional/w/wrong_import_order.txt b/tests/functional/w/wrong_import_order.txt +index 9f143c292..a283467af 100644 --- a/tests/functional/w/wrong_import_order.txt +++ b/tests/functional/w/wrong_import_order.txt -@@ -3,14 +3,14 @@ wrong-import-order:14:0:14:10::"standard +@@ -3,14 +3,14 @@ wrong-import-order:14:0:14:10::"standard import ""sys"" should be placed before wrong-import-order:15:0:15:15::"standard import ""datetime"" should be placed before third party imports ""six"", ""astroid.are_exclusive""":UNDEFINED wrong-import-order:18:0:18:22::"third party import ""totally_missing"" should be placed before local import ""package.Class""":UNDEFINED wrong-import-order:20:0:20:14::"third party import ""astroid"" should be placed before local imports ""package.Class"", "".package""":UNDEFINED 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 index 28ed0c8951..a0496232cd 100644 --- 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 @@ -1,4 +1,4 @@ -From 2a08adb0e90219626dac0b6d05a21265e460eae2 Mon Sep 17 00:00:00 2001 +From a1ec7fa97cb73754cb250a9cf0ea95b9d0511e0c 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 @@ -20,7 +20,7 @@ Signed-off-by: Leon Anavi 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 0cf1ade57..7a4665ce0 100644 +index a3cc3f43b..5eaf5ee5e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,8 +8,7 @@ name = "pylint" @@ -43,6 +43,3 @@ index 0cf1ade57..7a4665ce0 100644 [tool.setuptools.packages.find] include = [ "pylint*" ] --- -2.39.5 - diff --git a/meta-python/recipes-devtools/python/python3-pylint_3.3.6.bb b/meta-python/recipes-devtools/python/python3-pylint_3.3.7.bb similarity index 82% rename from meta-python/recipes-devtools/python/python3-pylint_3.3.6.bb rename to meta-python/recipes-devtools/python/python3-pylint_3.3.7.bb index 04761471d3..c4885ff7b4 100644 --- a/meta-python/recipes-devtools/python/python3-pylint_3.3.6.bb +++ b/meta-python/recipes-devtools/python/python3-pylint_3.3.7.bb @@ -3,11 +3,11 @@ HOMEPAGE = "https://www.pylint.org/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" -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 \ +SRCREV = "f798a4a3508bcbb8ad0773ae14bf32d28dcfdcbe" +SRC_URI += "git://github.com/pylint-dev/pylint;branch=main;protocol=https \ + file://0001-Adjust-test-expectations-for-ptest.patch \ + file://0002-pyproject.toml-Keep-tool.setuptools.license-files.patch \ + file://run-ptest \ " inherit python_setuptools_build_meta ptest