From 2aac8bb7ef7a42d20e0cc18e62afca7877f6b34b Mon Sep 17 00:00:00 2001 From: Ken Lautner Date: Tue, 8 Mar 2022 14:42:08 -0800 Subject: [PATCH] .pytool: Update to newest pytools 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 --- .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 +- .../HostUnitTestCompilerPlugin.py | 2 +- .../HostUnitTestDscCompleteCheck.py | 2 +- .pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py | 2 +- .pytool/Plugin/SpellCheck/SpellCheck.py | 2 +- .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 2 +- pip-requirements.txt | 6 +++--- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py b/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py index 1496e1f249..b09fb17040 100644 --- a/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py +++ b/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py @@ -69,7 +69,7 @@ class CharEncodingCheck(ICiBuildPlugin): overall_status = 0 files_tested = 0 - abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) + abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename) if abs_pkg_path is None: tc.SetSkipped() @@ -90,7 +90,7 @@ class CharEncodingCheck(ICiBuildPlugin): tc.LogStdError("CharEncodingCheck.IgnoreInf -> {0} not found in filesystem. Invalid ignore file".format(a)) logging.info("CharEncodingCheck.IgnoreInf -> {0} not found in filesystem. Invalid ignore file".format(a)) - files = [Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(x) for x in files] + files = [Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(x) for x in files] for a in files: files_tested += 1 if(self.TestEncodingOk(a, enc)): diff --git a/.pytool/Plugin/CompilerPlugin/CompilerPlugin.py b/.pytool/Plugin/CompilerPlugin/CompilerPlugin.py index e8657940d7..3cf3888828 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.") return -1 - AP = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) + AP = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename) APDSC = os.path.join(AP, pkgconfig["DscPath"].strip()) AP_Path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC) diff --git a/.pytool/Plugin/DependencyCheck/DependencyCheck.py b/.pytool/Plugin/DependencyCheck/DependencyCheck.py index db154d769a..07c5682d95 100644 --- a/.pytool/Plugin/DependencyCheck/DependencyCheck.py +++ b/.pytool/Plugin/DependencyCheck/DependencyCheck.py @@ -55,7 +55,7 @@ class DependencyCheck(ICiBuildPlugin): overall_status = 0 # Get current platform - abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) + abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename) # Get INF Files INFFiles = self.WalkDirectoryForExtension([".inf"], abs_pkg_path) diff --git a/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py b/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py index c613cd5233..351137c5e4 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.") return -1 - abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath( + abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath( packagename) abs_dsc_path = os.path.join(abs_pkg_path, pkgconfig["DscPath"].strip()) wsr_dsc_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath( diff --git a/.pytool/Plugin/GuidCheck/GuidCheck.py b/.pytool/Plugin/GuidCheck/GuidCheck.py index 61fdc77911..7e17a648a4 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, environment, PLM, PLMHelper, tc, output_stream=None): Errors = [] - abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath( + abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath( packagename) if abs_pkg_path is None: diff --git a/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py b/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py index f21b40caf2..76e3392ba1 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.") return -1 - AP = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) + AP = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename) APDSC = os.path.join(AP, pkgconfig["DscPath"].strip()) AP_Path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC) diff --git a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py index 66bdecacfb..8a8883edf4 100644 --- a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py +++ b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py @@ -61,7 +61,7 @@ class HostUnitTestDscCompleteCheck(ICiBuildPlugin): "DscPath not found in config file. Nothing to check.") return -1 - abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath( + abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath( packagename) abs_dsc_path = os.path.join(abs_pkg_path, pkgconfig["DscPath"].strip()) wsr_dsc_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath( diff --git a/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py b/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py index 20d87f13f5..1a38d802ef 100644 --- a/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py +++ b/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py @@ -63,7 +63,7 @@ class LibraryClassCheck(ICiBuildPlugin): overall_status = 0 LibraryClassIgnore = [] - abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) + abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename) abs_dec_path = self.__GetPkgDec(abs_pkg_path) wsr_dec_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(abs_dec_path) diff --git a/.pytool/Plugin/SpellCheck/SpellCheck.py b/.pytool/Plugin/SpellCheck/SpellCheck.py index 05c471d91b..8347fa9900 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, environment, PLM, PLMHelper, tc, output_stream=None): Errors = [] - abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath( + abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath( packagename) if abs_pkg_path is None: diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py index ea8396942b..82db7a5a43 100644 --- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py +++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py @@ -421,7 +421,7 @@ class UncrustifyCheck(ICiBuildPlugin): """ Initializes plugin environment information. """ - self._abs_package_path = edk2_path.GetAbsolutePathOnThisSytemFromEdk2RelativePath( + self._abs_package_path = edk2_path.GetAbsolutePathOnThisSystemFromEdk2RelativePath( package_rel_path) self._abs_workspace_path = edk2_path.WorkspacePath self._package_config = package_config diff --git a/pip-requirements.txt b/pip-requirements.txt index aea2e6ece4..f8bcd9ceb5 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -12,7 +12,7 @@ # https://www.python.org/dev/peps/pep-0440/#version-specifiers ## -edk2-pytool-library==0.10.* -edk2-pytool-extensions~=0.13.3 -edk2-basetools==0.1.2 +edk2-pytool-library==0.11.2 +edk2-pytool-extensions~=0.16.0 +edk2-basetools==0.1.13 antlr4-python3-runtime==4.7.1 -- 2.39.5