From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web08.546.1644536870467246843 for ; Thu, 10 Feb 2022 15:47:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Zhtqro1o; spf=pass (domain: gmail.com, ip: 209.85.216.41, mailfrom: kenlautner3@gmail.com) Received: by mail-pj1-f41.google.com with SMTP id k60-20020a17090a4cc200b001b932781f3eso2945565pjh.0 for ; Thu, 10 Feb 2022 15:47:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pJcBZ148rfDSdkUTPaCjKlKm3nsSBEWsNWGsxvtHcvo=; b=Zhtqro1ooy8oIsaJGMpz6UIgM/LvzDtQNXHErus0/dZk1rnywG/9Ij8jVMJQKlepRd uyAiXcYKHhS4LYwCAsnu5XRvm873I92Rjrnc6Gy47x6MXXkAaYU9iT+2nnurFQjvCY3K n3cynSEOl72g/hJ+Sbou0sKmuS/1qlf0LrMvq7B1s1HMXwiCctiLYN9TJ6ciHG2pspaP WGjl23N14L2AF62zdX7LHENYE24T+inU/bygOjdOcFh0oIRXTj1aSti2ftJ4hx5EkRBP NVzx8OXNlPgoi17BhAPneCNK10osNrdbhtT2qnqIyGtZhA52cBNPduRq8d//SP8tP8gv Q66g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pJcBZ148rfDSdkUTPaCjKlKm3nsSBEWsNWGsxvtHcvo=; b=sk1j9cqUpuASKaL9INJyeQ9fl2EHUlfeAwsgh1hwb3MsvKLeJUx3inaPZIRONuzYLc Af03wGb1nrc/M218x70KbfJTQrV2a8H3bamSU6R2vJ1VdTEp98FUSivTRfCQiBj4fCIR N3fkYnJ0MHF6SvNesizjVx94HcpKYZ6QAshZSvD4OU5Sy4S3H477aqBduC7QOdW5wETV 8vDBJnwLBX3LHAjyGW+T3uvCZ7RvGuGRnNNEf1zEg+s1A19YZsfe+lj79vURWBMuigbE kpufEejxDSSjc3e/GldO2883ySBmtM65Bkw5IphFXjH8l8iSTC7fKtZq3SKzOK/bMJCi 53OQ== X-Gm-Message-State: AOAM530yWycCji/ZYGvC8dcYpVzGOw5filEPYDjmZ9y2XdzHwGRK3Yvw dcRHPA9wtydNrEzWxGlexEVLBdAV0CMWRQ== X-Google-Smtp-Source: ABdhPJxEXDHReGCyJxOZcJr/U88nmfRdVlR8oTKdqMgbHctxHe5t679XytsVLqYkQ6QnK/1WZuek4Q== X-Received: by 2002:a17:90b:1b0e:: with SMTP id nu14mr5279575pjb.44.1644536869631; Thu, 10 Feb 2022 15:47:49 -0800 (PST) Return-Path: Received: from localhost.localdomain ([12.157.155.61]) by smtp.gmail.com with ESMTPSA id mn7sm3377826pjb.8.2022.02.10.15.47.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 15:47:49 -0800 (PST) From: "Kenneth Lautner" To: devel@edk2.groups.io Cc: Sean Brogan , Bret Barkelew , Michael D Kinney , Liming Gao Subject: [PATCH v2 1/1] .pytool: Update to newest pytools Date: Thu, 10 Feb 2022 15:47:37 -0800 Message-Id: <20220210234737.2394-1-kenlautner3@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Ken Lautner Update to the newest pytools and resolves the API change for GetAbsolutePathOnThisSytemFromEdk2RelativePath Cc: Sean Brogan Cc: Bret Barkelew Cc: Michael D Kinney Cc: Liming Gao Signed-off-by: Kenneth Lautner Reviewed-by: Sean Brogan --- .azurepipelines/Ubuntu-PatchCheck.yml = | 2 +- .azurepipelines/templates/platform-build-run-steps.yml = | 2 +- .azurepipelines/templates/pr-gate-steps.yml = | 2 +- .pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py = | 4 ++-- .pytool/Plugin/CompilerPlugin/CompilerPlugin.py = | 2 +- .pytool/Plugin/DependencyCheck/DependencyCheck.py = | 2 +- .pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py = | 2 +- .pytool/Plugin/GuidCheck/GuidCheck.py = | 2 +- .pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py = | 2 +- .pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.p= y | 2 +- .pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py = | 2 +- .pytool/Plugin/SpellCheck/SpellCheck.py = | 2 +- .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py = | 2 +- pip-requirements.txt = | 6 +++--- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.azurepipelines/Ubuntu-PatchCheck.yml b/.azurepipelines/Ubuntu= -PatchCheck.yml index 4de453bf9db8..d55c238592ef 100644 --- a/.azurepipelines/Ubuntu-PatchCheck.yml +++ b/.azurepipelines/Ubuntu-PatchCheck.yml @@ -27,7 +27,7 @@ steps: =0D - task: UsePythonVersion@0=0D inputs:=0D - versionSpec: '3.7.x'=0D + versionSpec: '3.9.x'=0D architecture: 'x64'=0D =0D - script: |=0D diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azur= epipelines/templates/platform-build-run-steps.yml index 97e7faa26682..36cdce9bf8fa 100644 --- a/.azurepipelines/templates/platform-build-run-steps.yml +++ b/.azurepipelines/templates/platform-build-run-steps.yml @@ -42,7 +42,7 @@ steps: =0D - task: UsePythonVersion@0=0D inputs:=0D - versionSpec: "3.8.x"=0D + versionSpec: "3.9.x"=0D architecture: "x64"=0D =0D - script: pip install -r pip-requirements.txt --upgrade=0D diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/= templates/pr-gate-steps.yml index 70c19a462194..6601c247421b 100644 --- a/.azurepipelines/templates/pr-gate-steps.yml +++ b/.azurepipelines/templates/pr-gate-steps.yml @@ -20,7 +20,7 @@ steps: =0D - task: UsePythonVersion@0=0D inputs:=0D - versionSpec: '3.8.x'=0D + versionSpec: '3.9.x'=0D architecture: 'x64'=0D =0D - script: pip install -r pip-requirements.txt --upgrade=0D diff --git a/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py b/.pytoo= l/Plugin/CharEncodingCheck/CharEncodingCheck.py index 1496e1f24934..b09fb1704087 100644 --- a/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py +++ b/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py @@ -69,7 +69,7 @@ class CharEncodingCheck(ICiBuildPlugin): overall_status =3D 0=0D files_tested =3D 0=0D =0D - abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2Rel= ativePath(packagename)=0D + abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2Re= lativePath(packagename)=0D =0D if abs_pkg_path is None:=0D tc.SetSkipped()=0D @@ -90,7 +90,7 @@ class CharEncodingCheck(ICiBuildPlugin): tc.LogStdError("CharEncodingCheck.IgnoreInf -> {0}= not found in filesystem. Invalid ignore file".format(a))=0D logging.info("CharEncodingCheck.IgnoreInf -> {0} n= ot found in filesystem. Invalid ignore file".format(a))=0D =0D - files =3D [Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2Relat= ivePath(x) for x in files]=0D + files =3D [Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2Rela= tivePath(x) for x in files]=0D for a in files:=0D files_tested +=3D 1=0D if(self.TestEncodingOk(a, enc)):=0D diff --git a/.pytool/Plugin/CompilerPlugin/CompilerPlugin.py b/.pytool/Plug= in/CompilerPlugin/CompilerPlugin.py index e8657940d71b..3cf3888828c0 100644 --- a/.pytool/Plugin/CompilerPlugin/CompilerPlugin.py +++ b/.pytool/Plugin/CompilerPlugin/CompilerPlugin.py @@ -61,7 +61,7 @@ class CompilerPlugin(ICiBuildPlugin): tc.LogStdError("DscPath not found in config file. Nothing to = compile.")=0D return -1=0D =0D - AP =3D Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(= packagename)=0D + AP =3D Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath= (packagename)=0D =0D APDSC =3D os.path.join(AP, pkgconfig["DscPath"].strip())=0D AP_Path =3D Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC)= =0D diff --git a/.pytool/Plugin/DependencyCheck/DependencyCheck.py b/.pytool/Pl= ugin/DependencyCheck/DependencyCheck.py index db154d769a39..07c5682d95d3 100644 --- a/.pytool/Plugin/DependencyCheck/DependencyCheck.py +++ b/.pytool/Plugin/DependencyCheck/DependencyCheck.py @@ -55,7 +55,7 @@ class DependencyCheck(ICiBuildPlugin): overall_status =3D 0=0D =0D # Get current platform=0D - abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2Rel= ativePath(packagename)=0D + abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2Re= lativePath(packagename)=0D =0D # Get INF Files=0D INFFiles =3D self.WalkDirectoryForExtension([".inf"], abs_pkg_path= )=0D diff --git a/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py b/.pytool/= Plugin/DscCompleteCheck/DscCompleteCheck.py index c613cd52334c..351137c5e4b7 100644 --- a/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py +++ b/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py @@ -58,7 +58,7 @@ class DscCompleteCheck(ICiBuildPlugin): "DscPath not found in config file. Nothing to check.")=0D return -1=0D =0D - abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2Rel= ativePath(=0D + abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2Re= lativePath(=0D packagename)=0D abs_dsc_path =3D os.path.join(abs_pkg_path, pkgconfig["DscPath"].s= trip())=0D wsr_dsc_path =3D Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(= =0D diff --git a/.pytool/Plugin/GuidCheck/GuidCheck.py b/.pytool/Plugin/GuidChe= ck/GuidCheck.py index 61fdc7791128..7e17a648a432 100644 --- a/.pytool/Plugin/GuidCheck/GuidCheck.py +++ b/.pytool/Plugin/GuidCheck/GuidCheck.py @@ -116,7 +116,7 @@ class GuidCheck(ICiBuildPlugin): def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environm= ent, PLM, PLMHelper, tc, output_stream=3DNone):=0D Errors =3D []=0D =0D - abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2Rel= ativePath(=0D + abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2Re= lativePath(=0D packagename)=0D =0D if abs_pkg_path is None:=0D diff --git a/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompiler= Plugin.py b/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerP= lugin.py index f21b40caf291..76e3392ba179 100644 --- a/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.= py +++ b/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.= py @@ -93,7 +93,7 @@ class HostUnitTestCompilerPlugin(ICiBuildPlugin): tc.LogStdError("DscPath not found in config file. Nothing to = compile for HostBasedUnitTests.")=0D return -1=0D =0D - AP =3D Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(= packagename)=0D + AP =3D Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath= (packagename)=0D =0D APDSC =3D os.path.join(AP, pkgconfig["DscPath"].strip())=0D AP_Path =3D Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC)= =0D diff --git a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCom= pleteCheck.py b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDsc= CompleteCheck.py index 66bdecacfbc2..8a8883edf4a9 100644 --- a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCh= eck.py +++ b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCh= eck.py @@ -61,7 +61,7 @@ class HostUnitTestDscCompleteCheck(ICiBuildPlugin): "DscPath not found in config file. Nothing to check.")=0D return -1=0D =0D - abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2Rel= ativePath(=0D + abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2Re= lativePath(=0D packagename)=0D abs_dsc_path =3D os.path.join(abs_pkg_path, pkgconfig["DscPath"].s= trip())=0D wsr_dsc_path =3D Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(= =0D diff --git a/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py b/.pytoo= l/Plugin/LibraryClassCheck/LibraryClassCheck.py index 20d87f13f524..1a38d802ef5d 100644 --- a/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py +++ b/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py @@ -63,7 +63,7 @@ class LibraryClassCheck(ICiBuildPlugin): overall_status =3D 0=0D LibraryClassIgnore =3D []=0D =0D - abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2Rel= ativePath(packagename)=0D + abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2Re= lativePath(packagename)=0D abs_dec_path =3D self.__GetPkgDec(abs_pkg_path)=0D wsr_dec_path =3D Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(a= bs_dec_path)=0D =0D diff --git a/.pytool/Plugin/SpellCheck/SpellCheck.py b/.pytool/Plugin/Spell= Check/SpellCheck.py index 05c471d91ba1..8347fa990042 100644 --- a/.pytool/Plugin/SpellCheck/SpellCheck.py +++ b/.pytool/Plugin/SpellCheck/SpellCheck.py @@ -73,7 +73,7 @@ class SpellCheck(ICiBuildPlugin): def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environm= ent, PLM, PLMHelper, tc, output_stream=3DNone):=0D Errors =3D []=0D =0D - abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2Rel= ativePath(=0D + abs_pkg_path =3D Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2Re= lativePath(=0D packagename)=0D =0D if abs_pkg_path is None:=0D diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Pl= ugin/UncrustifyCheck/UncrustifyCheck.py index 6db8d1739a80..c74f03293dc2 100644 --- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py +++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py @@ -421,7 +421,7 @@ class UncrustifyCheck(ICiBuildPlugin): """=0D Initializes plugin environment information.=0D """=0D - self._abs_package_path =3D edk2_path.GetAbsolutePathOnThisSytemFro= mEdk2RelativePath(=0D + self._abs_package_path =3D edk2_path.GetAbsolutePathOnThisSystemFr= omEdk2RelativePath(=0D package_rel_path)=0D self._abs_workspace_path =3D edk2_path.WorkspacePath=0D self._package_config =3D package_config=0D diff --git a/pip-requirements.txt b/pip-requirements.txt index aea2e6ece431..111bbc603861 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -12,7 +12,7 @@ # https://www.python.org/dev/peps/pep-0440/#version-specifiers=0D ##=0D =0D -edk2-pytool-library=3D=3D0.10.*=0D -edk2-pytool-extensions~=3D0.13.3=0D -edk2-basetools=3D=3D0.1.2=0D +edk2-pytool-library=3D=3D0.11.2=0D +edk2-pytool-extensions~=3D0.15.2=0D +edk2-basetools=3D=3D0.1.13=0D antlr4-python3-runtime=3D=3D4.7.1=0D --=20 2.31.1.windows.1