From patchwork Thu Mar 14 01:05:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel McGregor X-Patchwork-Id: 40950 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D107C54E66 for ; Thu, 14 Mar 2024 01:05:32 +0000 (UTC) Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) by mx.groups.io with SMTP id smtpd.web10.711.1710378330443285925 for ; Wed, 13 Mar 2024 18:05:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=S3WqxMXU; spf=pass (domain: gmail.com, ip: 209.85.166.171, mailfrom: danismostlikely@gmail.com) Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-36524116e30so1376575ab.0 for ; Wed, 13 Mar 2024 18:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710378329; x=1710983129; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6JP/1akvVswSpWq+lXspPvpermPkbV8jYUSAvWKxbFc=; b=S3WqxMXUUxF9KWVfgkVFceF1ejE4c1IUwhBKs1lGpn1xe80ze+lPZttHceFAxKt2sn BX08s39c3y7wg2HL9yx1x1IX6Mm1AikwBOPwjxmfVLPc3m01E4xbmbBOZANG8wb3LffG rIciP7qbvH58CZL4bjHxb9sZTsV5wlIPhF8aymrqT3jptC8qCq07EsBQKMaxUPXvdoFm R4Sn+TgKDx2JwlawcarXVhcNuKyB5RkPT0ONNlIvPlm0c73A+cB3rDZN/3ULzMTcy1k2 APPEkBlEZVStUlpvUoCOlM1w7Omx0LqUJYvusCh3Glhaf8Sb9y/L+9t1gfvv6XdNyQg8 fHZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710378329; x=1710983129; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6JP/1akvVswSpWq+lXspPvpermPkbV8jYUSAvWKxbFc=; b=uMN4jbnkCIyfVkcqBm/m3ZIMQwG28Tue/VtK1U8T5o/J7vtQqJCBnPdpmi7QgW6By4 In5zqGDsIlo/bbSoY0FYqYxq0jz5UbzTgh/XvwtBkPyni1I443SJcBcrtauyeDgnPb3j am0pSUiQJk3uSigQ8+Nou5yq3+n/DUlhwcRGgmQ1IXDTPZYFl5ge9yyiMMMeKDfmKRr4 eXFdyMyQ0LAr8UqGoHjNLJkd3w/4XpkTtHFJe4nWJsQRpoSQzMG/Mxo0xbogxeyua+0g lp9Fkv61GxfTTuy9BhzUYng4SGpnbZHVZgO5xSWmUJPVO8UjUbCggaF7lPzu2gQ+oqt6 S9AA== X-Gm-Message-State: AOJu0YxJdI4hLRDn4PG30YDLtLpzeq+wBQguF9uP/pqp334K0C6tuPtq Uyi4+tcjy5g53l4MDz4PKechnL2mkGO8rLjCZaDs5biGp2kmtbF64PwdtnEQAio= X-Google-Smtp-Source: AGHT+IHZzdE8VAOm6pmH1tkZEAKRu4KPplaOgke4rmKpt85DfRZZLl+XCIAUhSg/pY+EbRFE/MjMaA== X-Received: by 2002:a92:d78e:0:b0:366:4ca0:c290 with SMTP id d14-20020a92d78e000000b003664ca0c290mr291882iln.11.1710378329488; Wed, 13 Mar 2024 18:05:29 -0700 (PDT) Received: from nebuchadnezzar.home.dankm.pro ([204.83.204.143]) by smtp.gmail.com with ESMTPSA id m18-20020a92c532000000b003667fb9130bsm105701ili.85.2024.03.13.18.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 18:05:29 -0700 (PDT) From: Dan McGregor To: openembedded-devel@lists.openembedded.org Cc: Dan McGregor Subject: [meta-python][PATCH v2] python3-pylint: Fix ptest failures Date: Wed, 13 Mar 2024 19:05:21 -0600 Message-ID: <20240314010521.1841026-1-danismostlikely@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 14 Mar 2024 01:05:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109307 From: Dan McGregor Due to the way we install ptests, some imports switch from first party to third party. Update test expectations Signed-off-by: Dan McGregor --- ...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 +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 +--- + 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 + 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"