From nobody Wed May 15 11:05:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+110216+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+110216+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1698420077; cv=none; d=zohomail.com; s=zohoarc; b=nL+bIvIufngqIi6JwAQJBLgto9CHAX0/d2tSztW/w03YNtU9EXDoqxx3PmKPuaVXP102l/NwR6sidtkyi8LGJfq/Ui+Pi/WMnK1DMB1UXQ5axBqCJZDQt2bTRhWCDH5qfWGAkqkoZVvqc4DNFHBaF2VTYMOw41MRX3JlYt+Vk18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698420077; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=Per3rn+MDYtLKE5JpW70I4/ine4TyZI2nRWGj36HOZE=; b=YqGey9/4nhKhxx4D2SBO8PGZ03RvTtn9oKH702kC2xBLHNiu/rgyWTPSq5dD3O3OcgLTkspNgXvrxBZ/oKTqRPIYbuP1s8VsFOqMwpYBlZnFdmEDfRenTuc7O2PMI8Ram95YZvU+Xtpg9HpsLhIdlBsOggt4jChdb1WjKj9wHxg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+110216+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1698420077236795.2528727127755; Fri, 27 Oct 2023 08:21:17 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=Uh6HTK8BmQQtw7yhu0JLpEXLK47QaGxCeoCatzzCcKM=; 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=WXvGWdooS8VH4HVwgRl03CsSZLfLvwE3DcpsRrsXIkPU6PQwwBy8zojxm+OrICCZSM1yBh4s H8fjkHPWtJk60Hyg8BGcZkk6TKr6xCLe1p/PG+YHtMRFU81L8sfqK8NgxzliPbdSEyxKsH9qhFX LGtUhCXXVM2WKfgnBo1TO04U= X-Received: by 127.0.0.2 with SMTP id U2kuYY1788612xa7V5PHdXxI; 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: jCJBtldn0UjEDoaGXdUWieNGx1787277AA= 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-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1698420078605100004 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Michael Kubacki Reviewed-by: Rebecca Cran --- .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 from edk2toolext.environment.plugintypes.ci_build_plugin import ICiBuildPl= ugin from edk2toollib.uefi.edk2.parsers.dsc_parser import DscParser -from edk2toollib.uefi.edk2.parsers.inf_parser import InfParser +from edk2toollib.uefi.edk2.parsers.inf_parser import InfParser, AllPhases from edk2toolext.environment.var_dict import VarDict =20 =20 @@ -116,8 +116,9 @@ class HostUnitTestDscCompleteCheck(ICiBuildPlugin): # should compile test a library that is declared type = HOST_APPLICATION pass =20 - elif len(infp.SupportedPhases) > 0 and \ - "HOST_APPLICATION" in infp.SupportedPhases: + elif (len(infp.SupportedPhases) > 0 and + "HOST_APPLICATION" in infp.SupportedPhases and + infp.SupportedPhases !=3D AllPhases): # should compile test a library that supports HOST_APP= LICATION but # require it to be an explicit opt-in pass 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. """ if not shutil.which("git"): - logging.warn( + logging.warning( "Git is not found on this system. Git submodule paths will= not be considered.") return [] =20 @@ -325,7 +325,7 @@ class UncrustifyCheck(ICiBuildPlugin): If git is not found, an empty list will be returned. """ if not shutil.which("git"): - logging.warn( + logging.warning( "Git is not found on this system. Git submodule paths will= not be considered.") return [] =20 @@ -372,9 +372,9 @@ class UncrustifyCheck(ICiBuildPlugin): file_template_path =3D pathlib.Path(os.path.join(self._plu= gin_path, file_template_name)) self._file_template_contents =3D file_template_path.read_t= ext() except KeyError: - logging.warn("A file header template is not specified in the c= onfig file.") + logging.warning("A file header template is not specified in th= e config file.") except FileNotFoundError: - logging.warn("The specified file header template file was not = found.") + logging.warning("The specified file header template file was n= ot found.") try: func_template_name =3D parser["dummy_section"]["cmt_insert_fun= c_header"] =20 @@ -384,9 +384,9 @@ class UncrustifyCheck(ICiBuildPlugin): func_template_path =3D pathlib.Path(os.path.join(self._plu= gin_path, func_template_name)) self._func_template_contents =3D func_template_path.read_t= ext() except KeyError: - logging.warn("A function header template is not specified in t= he config file.") + logging.warning("A function header template is not specified i= n the config file.") except FileNotFoundError: - logging.warn("The specified function header template file was = not found.") + logging.warning("The specified function header template file w= as not found.") =20 def _initialize_app_info(self) -> None: """ 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 ## =20 -edk2-pytool-library=3D=3D0.15.3 -edk2-pytool-extensions~=3D0.23.10 +edk2-pytool-library=3D=3D0.19.3 +edk2-pytool-extensions~=3D0.25.1 edk2-basetools=3D=3D0.1.48 antlr4-python3-runtime=3D=3D4.7.1 lcov-cobertura=3D=3D2.0.2 --=20 2.34.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- 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/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Wed May 15 11:05:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+110217+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+110217+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1698420078; cv=none; d=zohomail.com; s=zohoarc; b=KTQyWgCU9n0Zf+5vZw5SXOR6mn5xNGXGbSHDzlBG6iOqH3HTWz0ZHgN/2GFmjM6V5nVDyQw+ZbeizFtLxFLnKOEOkdkwSofQ+R0VfMByr7ZOfgiinQY99oWhsEmaDhpFx1la3CQa8JWVy+jnq/5gqnsbFC6/32WLPe/5vp1S3zI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698420078; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=Od77AIPgPEULbIW+/5ru1f1ppLuuFmu0EH/86unVA/0=; b=buf9zVnop6sQdZYg8b/x3Hsza9h/fy8SOHKdbMTpNg10tIh+R2nd/bnl0Z2vNpDlI2cmclrCq/5LDOKQFzBMRBpadtDVBRzKTgYS9X1jito6Wi04u7SiM4KCBGkP3txl1OpXOOog3r9eHYg/fu2iUwIJpUjxm8SrnT53CRf/udM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+110217+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1698420078364232.15901740061315; Fri, 27 Oct 2023 08:21:18 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=ZUHJxItwNNp82XUeF6/ZQLQncPP2XNwntiBAU/HtS/g=; 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=1698420077; v=1; b=wD3sa/GGDLYuvf2Vt48YrDr3sE7zXwjeRUZR1TXst8MupDa8qM/tkE28JT/dMy7SpOddAMY4 sHyvKb87b7R8cvRiCHGe+5dRLb4KMalCIaTmjfeyirTTUlFs437AbVwM4S9H+9zE8g1ZOM4SwrW cdAnPI1St5vbjJ50pOI8FCCk= X-Received: by 127.0.0.2 with SMTP id 8bcOYY1788612xTlYdxemUWA; Fri, 27 Oct 2023 08:21:17 -0700 X-Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web10.9577.1698420077395193699 for ; Fri, 27 Oct 2023 08:21:17 -0700 X-Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-27d1fa1c787so1704371a91.3 for ; Fri, 27 Oct 2023 08:21:17 -0700 (PDT) X-Gm-Message-State: YfCgEZhjVgsmm5ut4foVoG34x1787277AA= X-Google-Smtp-Source: AGHT+IHYw/CM+arKWJ+vBdbc1Aad5GrN8GOSLO0SW2DQoKXl6tCBGAESysetb8+oqo06EQzBHVy7Kg== X-Received: by 2002:a17:90b:d8d:b0:280:6aa:2614 with SMTP id bg13-20020a17090b0d8d00b0028006aa2614mr3045310pjb.17.1698420076493; Fri, 27 Oct 2023 08:21:16 -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.15 (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 2/2] BaseTools: Plugin: Integration of edk2-pytools Date: Fri, 27 Oct 2023 08:15:51 -0700 Message-Id: <20231027151551.1043941-3-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-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1698420080371100011 Content-Type: text/plain; charset="utf-8" Performs Integration instructions necessary to upgrade edk2-pytool-library to 0.19.3 and edk2-pytool-extensions to 0.25.1. This includes resolving the deprecation of builder.mws and replacing it with builder.edk2path functionality. Cc: Sean Brogan Cc: Michael Kubacki Cc: Michael D Kinney Cc: Liming Gao Signed-off-by: Joey Vagedes Reviewed-by: Michael Kubacki Reviewed-by: Rebecca Cran --- BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py= | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBu= ildPlugin.py b/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheck= BuildPlugin.py index b1544666025e..aa3a2bbcab20 100644 --- a/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlug= in.py +++ b/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlug= in.py @@ -58,12 +58,12 @@ class DebugMacroCheckBuildPlugin(IUefiBuildPlugin): if "no-target" in build_target: return 0 =20 - pp =3D builder.pp.split(os.pathsep) - edk2 =3D Edk2Path(builder.ws, pp) + edk2 =3D builder.edk2path package =3D edk2.GetContainingPackage( - builder.mws.join(builder.ws, - builder.env.GetValue( - "ACTIVE_PLATFORM"))) + builder.edk2path.GetAbsolutePathOnThisSystemFromEdk2RelativePa= th( + builder.env.GetValue("ACTIVE_PLATFORM") + ) + ) package_path =3D Path( edk2.GetAbsolutePathOnThisSystemFromEdk2Relative= Path( package)) --=20 2.34.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#110217): https://edk2.groups.io/g/devel/message/110217 Mute This Topic: https://groups.io/mt/102223495/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-