From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 1DD5DD802E7 for ; Fri, 27 Oct 2023 15:21:17 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Jp5tued56ZHugRfen2VpYbYcQciQ4L1DHvGIbfOOQrQ=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1698420076; v=1; b=Pku5PEKPJ1vfL9VmByJUK1rsqUnLHyKtWgrGBohOzBb3n77NNoq5iPHdz+c1nTNWS9iqUgTW Xb1XH/OZcbAxZaNoL5taY7GEIsHI4RP8M+HUATj6B9mJZTm50GXIHEhSa3b3yciR7NJvRK4k6fC jKqF6xWSYHKyggUcl19bR344= X-Received: by 127.0.0.2 with SMTP id lTgAYY7687511xtRRti5oE0V; Fri, 27 Oct 2023 08:21:16 -0700 X-Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.9588.1698420076285135868 for ; Fri, 27 Oct 2023 08:21:16 -0700 X-Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-28019b66ad5so267879a91.3 for ; Fri, 27 Oct 2023 08:21:16 -0700 (PDT) X-Gm-Message-State: IqN86db6PI9AuTglrFcMiy8Hx7686176AA= X-Google-Smtp-Source: AGHT+IHTFCZXdzkH8U+xlhaCUoV2UYRK+ROqfhQ9iP8bZIdA1hK75Z2KHmqQnyxB4QZGl0dvgrznLA== X-Received: by 2002:a17:90a:d3cf:b0:279:354b:50f1 with SMTP id d15-20020a17090ad3cf00b00279354b50f1mr2741577pjw.3.1698420075433; Fri, 27 Oct 2023 08:21:15 -0700 (PDT) X-Received: from localhost.localdomain (c-174-164-102-13.hsd1.wa.comcast.net. [174.164.102.13]) by smtp.googlemail.com with ESMTPSA id e5-20020a17090ac20500b0027cf8869ee7sm3542018pjt.0.2023.10.27.08.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 08:21:15 -0700 (PDT) From: "Joey Vagedes via groups.io" X-Google-Original-From: Joey Vagedes To: devel@edk2.groups.io Cc: Sean Brogan , Michael Kubacki , Michael D Kinney , Liming Gao Subject: [edk2-devel] [PATCH v1 1/2] .pytool: Integration of edk2-pytools Date: Fri, 27 Oct 2023 08:15:50 -0700 Message-Id: <20231027151551.1043941-2-joeyvagedes@microsoft.com> In-Reply-To: <20231027151551.1043941-1-joeyvagedes@microsoft.com> References: <20231027151551.1043941-1-joeyvagedes@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,joeyvagedes@microsoft.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=Pku5PEKP; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=none Performs Integration instructions necessary to upgrade edk2-pytool-library to 0.19.3 and edk2-pytool-extensions to 0.25.1. This includes resolving deprecation warnings in the UncrustifyCheck plugin, and Updating the HostUnitTestDscCompleteCheck plguin to account for a change such that inf's that do not filter the LIBRARY_CLASS define to certain types, are assumed to also support HOST_APPLICATION. Cc: Sean Brogan Cc: Michael Kubacki Cc: Michael D Kinney Cc: Liming Gao Signed-off-by: Joey Vagedes --- .pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.p= y | 7 ++++--- .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py = | 12 ++++++------ pip-requirements.txt = | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCom= pleteCheck.py b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDsc= CompleteCheck.py index 8a8883edf4a9..164c8d4b7fd3 100644 --- a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCh= eck.py +++ b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCh= eck.py @@ -10,7 +10,7 @@ import logging import os=0D from edk2toolext.environment.plugintypes.ci_build_plugin import ICiBuildPl= ugin=0D from edk2toollib.uefi.edk2.parsers.dsc_parser import DscParser=0D -from edk2toollib.uefi.edk2.parsers.inf_parser import InfParser=0D +from edk2toollib.uefi.edk2.parsers.inf_parser import InfParser, AllPhases= =0D from edk2toolext.environment.var_dict import VarDict=0D =0D =0D @@ -116,8 +116,9 @@ class HostUnitTestDscCompleteCheck(ICiBuildPlugin): # should compile test a library that is declared type = HOST_APPLICATION=0D pass=0D =0D - elif len(infp.SupportedPhases) > 0 and \=0D - "HOST_APPLICATION" in infp.SupportedPhases:=0D + elif (len(infp.SupportedPhases) > 0 and=0D + "HOST_APPLICATION" in infp.SupportedPhases and=0D + infp.SupportedPhases !=3D AllPhases):=0D # should compile test a library that supports HOST_APP= LICATION but=0D # require it to be an explicit opt-in=0D pass=0D diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Pl= ugin/UncrustifyCheck/UncrustifyCheck.py index 8dc9ffe6945a..92aa3c33774d 100644 --- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py +++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py @@ -299,7 +299,7 @@ class UncrustifyCheck(ICiBuildPlugin): If git is not found, an empty list will be returned.=0D """=0D if not shutil.which("git"):=0D - logging.warn(=0D + logging.warning(=0D "Git is not found on this system. Git submodule paths will= not be considered.")=0D return []=0D =0D @@ -325,7 +325,7 @@ class UncrustifyCheck(ICiBuildPlugin): If git is not found, an empty list will be returned.=0D """=0D if not shutil.which("git"):=0D - logging.warn(=0D + logging.warning(=0D "Git is not found on this system. Git submodule paths will= not be considered.")=0D return []=0D =0D @@ -372,9 +372,9 @@ class UncrustifyCheck(ICiBuildPlugin): file_template_path =3D pathlib.Path(os.path.join(self._plu= gin_path, file_template_name))=0D self._file_template_contents =3D file_template_path.read_t= ext()=0D except KeyError:=0D - logging.warn("A file header template is not specified in the c= onfig file.")=0D + logging.warning("A file header template is not specified in th= e config file.")=0D except FileNotFoundError:=0D - logging.warn("The specified file header template file was not = found.")=0D + logging.warning("The specified file header template file was n= ot found.")=0D try:=0D func_template_name =3D parser["dummy_section"]["cmt_insert_fun= c_header"]=0D =0D @@ -384,9 +384,9 @@ class UncrustifyCheck(ICiBuildPlugin): func_template_path =3D pathlib.Path(os.path.join(self._plu= gin_path, func_template_name))=0D self._func_template_contents =3D func_template_path.read_t= ext()=0D except KeyError:=0D - logging.warn("A function header template is not specified in t= he config file.")=0D + logging.warning("A function header template is not specified i= n the config file.")=0D except FileNotFoundError:=0D - logging.warn("The specified function header template file was = not found.")=0D + logging.warning("The specified function header template file w= as not found.")=0D =0D def _initialize_app_info(self) -> None:=0D """=0D diff --git a/pip-requirements.txt b/pip-requirements.txt index a722dd3ac0b2..8177c60d1808 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -12,8 +12,8 @@ # https://www.python.org/dev/peps/pep-0440/#version-specifiers=0D ##=0D =0D -edk2-pytool-library=3D=3D0.15.3=0D -edk2-pytool-extensions~=3D0.23.10=0D +edk2-pytool-library=3D=3D0.19.3=0D +edk2-pytool-extensions~=3D0.25.1=0D edk2-basetools=3D=3D0.1.48=0D antlr4-python3-runtime=3D=3D4.7.1=0D lcov-cobertura=3D=3D2.0.2=0D --=20 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#110216): https://edk2.groups.io/g/devel/message/110216 Mute This Topic: https://groups.io/mt/102223494/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-