Trying that out now, but it looked like it had some tests that depended on line endings.
Worst case I put the change up at https://git.openembedded.org/meta-openembedded-contrib/ on the dankm/pylint branch. On Wed, Mar 13, 2024, 16:33 Khem Raj <raj.k...@gmail.com> wrote: > maybe this recipe needs to inherit dos2unix ? > > On Wed, Mar 13, 2024 at 3:05 PM Dan McGregor <danismostlik...@gmail.com> > wrote: > > > > > > > > On Wed, Mar 13, 2024, 15:17 Dan McGregor via lists.openembedded.org > <danismostlikely=gmail....@lists.openembedded.org> wrote: > >> > >> From: Dan McGregor <dan.mcgre...@vecima.com> > >> > >> Due to the way we install ptests, some imports switch from > >> first party to third party. Update test expectations > >> > >> Signed-off-by: Dan McGregor <dan.mcgre...@vecima.com> > >> --- > >> ...1-Adjust-test-expectations-for-ptest.patch | 44 +++++++++++++++++++ > >> .../python/python3-pylint_3.1.0.bb | 1 + > >> 2 files changed, 45 insertions(+) > >> create mode 100644 > meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch > >> > >> 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 > >> new file mode 100644 > >> index 00000000000..8edecbf1bd1 > >> --- /dev/null > >> +++ > b/meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch > >> @@ -0,0 +1,44 @@ > >> +From f3a213cf4922c122e554277ea2031c0c54cd3fe5 Mon Sep 17 00:00:00 2001 > >> +From: Dan McGregor <dan.mcgre...@vecima.com> > >> +Date: Wed, 13 Mar 2024 14:08:25 -0600 > >> +Subject: [PATCH] Adjust test expectations for ptest > >> + > >> +Because of the way we install ptests, some first party imports > >> +became third party. Reflect that in the test case. > >> + > >> +Upstream-Status: Inappropriate (embedded specific) > >> +Signed-off-by: Dan McGregor <dan.mcgre...@vecima.com> > >> +--- > >> + 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 068d2140d..9594ff9e0 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 import > ""sys"" should be placed before > > > > > > Hmm, is there a way to specify line endings? This patch needs CRLF line > endings, and it looks like that either didn't make it to the list, or > didn't get applied correctly. > > > >> + 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 > >> +-wrong-import-order:22:0:22:22::"first party import > ""pylint.checkers"" should be placed before local imports > ""package.Class"", "".package"", "".package2""":UNDEFINED > >> +-wrong-import-order:23:0:23:25::"first party import ""pylint.config"" > should be placed before local imports ""package.Class"", "".package"", > "".package2""":UNDEFINED > >> +-wrong-import-order:24:0:24:17::"first party import ""pylint.sys"" > should be placed before local imports ""package.Class"", "".package"", > "".package2""":UNDEFINED > >> +-wrong-import-order:25:0:25:28::"first party import > ""pylint.pyreverse"" should be placed before local imports > ""package.Class"", "".package"", "".package2""":UNDEFINED > >> +-wrong-import-order:30:0:30:40::"third party import > ""six.moves.urllib.parse.quote"" should be placed before first party > imports ""pylint.checkers"", ""pylint.config"", ""pylint.sys"", > ""pylint.pyreverse"" and local imports ""package.Class"", "".package"", > "".package2"" (...) ""package3.Class3"", "".package4"", > ""package4.Class4""":UNDEFINED > >> +-wrong-import-order:31:0:31:23::"first party import > ""pylint.constants"" should be placed before local imports > ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", > "".package4"", ""package4.Class4""":UNDEFINED > >> +-wrong-import-order:32:0:32:19::"standard import ""re"" should be > placed before third party imports ""six"", ""astroid.are_exclusive"", > ""unused_import"", ""totally_missing"", ""astroid"", > ""six.moves.urllib.parse.quote"", first party imports ""pylint.checkers"", > ""pylint.config"", ""pylint.sys"", ""pylint.pyreverse"", > ""pylint.constants"", and local imports ""package.Class"", "".package"", > "".package2"" (...) ""package3.Class3"", "".package4"", > ""package4.Class4""":UNDEFINED > >> +-wrong-import-order:32:0:32:19::"third party import ""requests"" > should be placed before first party imports ""pylint.checkers"", > ""pylint.config"", ""pylint.sys"", ""pylint.pyreverse"", > ""pylint.constants"" and local imports ""package.Class"", "".package"", > "".package2"" (...) ""package3.Class3"", "".package4"", > ""package4.Class4""":UNDEFINED > >> +-wrong-import-order:33:0:33:24::"first party import > ""pylint.exceptions"" should be placed before local imports > ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", > "".package4"", ""package4.Class4""":UNDEFINED > >> +-wrong-import-order:34:0:34:21::"first party import ""pylint.message"" > should be placed before local imports ""package.Class"", "".package"", > "".package2"" (...) ""package3.Class3"", "".package4"", > ""package4.Class4""":UNDEFINED > >> +-wrong-import-order:35:0:35:11::"standard import ""time"" should be > placed before third party imports ""six"", ""astroid.are_exclusive"", > ""unused_import"" (...) ""astroid"", ""six.moves.urllib.parse.quote"", > ""requests"", first party imports ""pylint.checkers"", ""pylint.config"", > ""pylint.sys"" (...) ""pylint.constants"", ""pylint.exceptions"", > ""pylint.message"", and local imports ""package.Class"", "".package"", > "".package2"" (...) ""package3.Class3"", "".package4"", > ""package4.Class4""":UNDEFINED > >> ++wrong-import-order:22:0:22:22::"third party import > ""pylint.checkers"" should be placed before local imports > ""package.Class"", "".package"", "".package2""":UNDEFINED > >> ++wrong-import-order:23:0:23:25::"third party import ""pylint.config"" > should be placed before local imports ""package.Class"", "".package"", > "".package2""":UNDEFINED > >> ++wrong-import-order:24:0:24:17::"third party import ""pylint.sys"" > should be placed before local imports ""package.Class"", "".package"", > "".package2""":UNDEFINED > >> ++wrong-import-order:25:0:25:28::"third party import > ""pylint.pyreverse"" should be placed before local imports > ""package.Class"", "".package"", "".package2""":UNDEFINED > >> ++wrong-import-order:30:0:30:40::"third party import > ""six.moves.urllib.parse.quote"" should be placed before local imports > ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", > "".package4"", ""package4.Class4""":UNDEFINED > >> ++wrong-import-order:31:0:31:23::"third party import > ""pylint.constants"" should be placed before local imports > ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", > "".package4"", ""package4.Class4""":UNDEFINED > >> ++wrong-import-order:32:0:32:19::"standard import ""re"" should be > placed before third party imports ""six"", ""astroid.are_exclusive"", > ""unused_import"" (...) ""pylint.pyreverse"", > ""six.moves.urllib.parse.quote"", ""pylint.constants"" and local imports > ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", > "".package4"", ""package4.Class4""":UNDEFINED > >> ++wrong-import-order:32:0:32:19::"third party import ""requests"" > should be placed before local imports ""package.Class"", "".package"", > "".package2"" (...) ""package3.Class3"", "".package4"", > ""package4.Class4""":UNDEFINED > >> ++wrong-import-order:33:0:33:24::"third party import > ""pylint.exceptions"" should be placed before local imports > ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", > "".package4"", ""package4.Class4""":UNDEFINED > >> ++wrong-import-order:34:0:34:21::"third party import ""pylint.message"" > should be placed before local imports ""package.Class"", "".package"", > "".package2"" (...) ""package3.Class3"", "".package4"", > ""package4.Class4""":UNDEFINED > >> ++wrong-import-order:35:0:35:11::"standard import ""time"" should be > placed before third party imports ""six"", ""astroid.are_exclusive"", > ""unused_import"" (...) ""requests"", ""pylint.exceptions"", > ""pylint.message"" and local imports ""package.Class"", "".package"", > "".package2"" (...) ""package3.Class3"", "".package4"", > ""package4.Class4""":UNDEFINED > >> diff --git a/meta-python/recipes-devtools/python/ > python3-pylint_3.1.0.bb b/meta-python/recipes-devtools/python/ > python3-pylint_3.1.0.bb > >> index 49f0b3eb6e4..12f4f908af7 100644 > >> --- a/meta-python/recipes-devtools/python/python3-pylint_3.1.0.bb > >> +++ b/meta-python/recipes-devtools/python/python3-pylint_3.1.0.bb > >> @@ -4,6 +4,7 @@ LICENSE = "GPL-2.0-only" > >> LIC_FILES_CHKSUM = > "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" > >> > >> SRC_URI += "git:// > github.com/pylint-dev/pylint;branch=maintenance/3.1.x;protocol=https \ > >> + file://0001-Adjust-test-expectations-for-ptest.patch \ > >> file://run-ptest \ > >> " > >> SRCREV = "053c2c3a25f97f043e10cdd41d2609e495a68f57" > >> -- > >> 2.41.0 > >> > >> > >> > >> > > > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#109301): https://lists.openembedded.org/g/openembedded-devel/message/109301 Mute This Topic: https://lists.openembedded.org/mt/104914934/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
