* [PATCH v4 1/2] .pytool: Update to newest pytools
2022-03-08 23:17 [PATCH v4 0/2] Update .pytools and .azurepipelines Kenneth Lautner
@ 2022-03-08 23:17 ` Kenneth Lautner
2022-03-08 23:17 ` [PATCH v4 2/2] .azurepipelines: Updated python versions Kenneth Lautner
1 sibling, 0 replies; 4+ messages in thread
From: Kenneth Lautner @ 2022-03-08 23:17 UTC (permalink / raw)
To: devel; +Cc: Sean Brogan, Bret Barkelew, Michael D Kinney, Liming Gao
From: Ken Lautner <kenlautner3@gmail.com>
Update to the newest pytools and resolves the API change for
GetAbsolutePathOnThisSytemFromEdk2RelativePath.
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>
---
.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.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 1496e1f24934..b09fb1704087 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 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.")
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 db154d769a39..07c5682d95d3 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 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.")
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 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, 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 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.")
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 66bdecacfbc2..8a8883edf4a9 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 20d87f13f524..1a38d802ef5d 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 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, 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 ea8396942b16..82db7a5a438b 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 aea2e6ece431..f8bcd9ceb5e6 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.31.1.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v4 2/2] .azurepipelines: Updated python versions
2022-03-08 23:17 [PATCH v4 0/2] Update .pytools and .azurepipelines Kenneth Lautner
2022-03-08 23:17 ` [PATCH v4 1/2] .pytool: Update to newest pytools Kenneth Lautner
@ 2022-03-08 23:17 ` Kenneth Lautner
1 sibling, 0 replies; 4+ messages in thread
From: Kenneth Lautner @ 2022-03-08 23:17 UTC (permalink / raw)
To: devel; +Cc: Sean Brogan, Bret Barkelew, Michael D Kinney, Liming Gao
From: Ken Lautner <kenlautner3@gmail.com>
Updated .azurepipelines to use newest python version
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>
---
.azurepipelines/Ubuntu-PatchCheck.yml | 2 +-
.azurepipelines/templates/platform-build-run-steps.yml | 2 +-
.azurepipelines/templates/pr-gate-steps.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.azurepipelines/Ubuntu-PatchCheck.yml b/.azurepipelines/Ubuntu-PatchCheck.yml
index 4de453bf9db8..d1b214f3a909 100644
--- a/.azurepipelines/Ubuntu-PatchCheck.yml
+++ b/.azurepipelines/Ubuntu-PatchCheck.yml
@@ -27,7 +27,7 @@ steps:
- task: UsePythonVersion@0
inputs:
- versionSpec: '3.7.x'
+ versionSpec: '3.10.x'
architecture: 'x64'
- script: |
diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azurepipelines/templates/platform-build-run-steps.yml
index 97e7faa26682..8b3112935867 100644
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -42,7 +42,7 @@ steps:
- task: UsePythonVersion@0
inputs:
- versionSpec: "3.8.x"
+ versionSpec: "3.10.x"
architecture: "x64"
- script: pip install -r pip-requirements.txt --upgrade
diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml
index 70c19a462194..754fecd2ecdf 100644
--- a/.azurepipelines/templates/pr-gate-steps.yml
+++ b/.azurepipelines/templates/pr-gate-steps.yml
@@ -20,7 +20,7 @@ steps:
- task: UsePythonVersion@0
inputs:
- versionSpec: '3.8.x'
+ versionSpec: '3.10.x'
architecture: 'x64'
- script: pip install -r pip-requirements.txt --upgrade
--
2.31.1.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread