[edk2-devel] [PATCH v1 0/2] Upgrade edk2-pytools to latest

[edk2-devel] [PATCH v1 0/2] Upgrade edk2-pytools to latest

[Joey Vagedes via groups.io]

Upgrades edk2-pytool-library to v0.19.3 and edk2-pytool-extensions to v0.25.1
and performs all necessary integrations as noted in the individual package
commits.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Kubacki <mikuback@linux.microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>

Joey Vagedes (2):
  .pytool: Integration of edk2-pytools
  BaseTools: Plugin: Integration of edk2-pytools

 .pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py |  7 ++++---
 .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py                           | 12 ++++++------
 BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py  | 10 +++++-----
 pip-requirements.txt                                                        |  4 ++--
 4 files changed, 17 insertions(+), 16 deletions(-)

-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#110215): https://edk2.groups.io/g/devel/message/110215
Mute This Topic: https://groups.io/mt/102223493/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH v1 1/2] .pytool: Integration of edk2-pytools

[Joey Vagedes via groups.io]

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 <sean.brogan@microsoft.com>
Cc: Michael Kubacki <mikuback@linux.microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Joey Vagedes <joeyvagedes@gmail.com>
---
 .pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py |  7 ++++---
 .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py                           | 12 ++++++------
 pip-requirements.txt                                                        |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py
index 8a8883edf4a9..164c8d4b7fd3 100644
--- a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py
+++ b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py
@@ -10,7 +10,7 @@ import logging
 import os
 from edk2toolext.environment.plugintypes.ci_build_plugin import ICiBuildPlugin
 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
 
 
@@ -116,8 +116,9 @@ class HostUnitTestDscCompleteCheck(ICiBuildPlugin):
                     # should compile test a library that is declared type HOST_APPLICATION
                     pass
 
-                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 != AllPhases):
                     # should compile test a library that supports HOST_APPLICATION but
                     # require it to be an explicit opt-in
                     pass
diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/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 []
 
@@ -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 []
 
@@ -372,9 +372,9 @@ class UncrustifyCheck(ICiBuildPlugin):
                 file_template_path = pathlib.Path(os.path.join(self._plugin_path, file_template_name))
                 self._file_template_contents = file_template_path.read_text()
         except KeyError:
-            logging.warn("A file header template is not specified in the config file.")
+            logging.warning("A file header template is not specified in the config file.")
         except FileNotFoundError:
-            logging.warn("The specified file header template file was not found.")
+            logging.warning("The specified file header template file was not found.")
         try:
             func_template_name = parser["dummy_section"]["cmt_insert_func_header"]
 
@@ -384,9 +384,9 @@ class UncrustifyCheck(ICiBuildPlugin):
                 func_template_path = pathlib.Path(os.path.join(self._plugin_path, func_template_name))
                 self._func_template_contents = func_template_path.read_text()
         except KeyError:
-            logging.warn("A function header template is not specified in the config file.")
+            logging.warning("A function header template is not specified in the config file.")
         except FileNotFoundError:
-            logging.warn("The specified function header template file was not found.")
+            logging.warning("The specified function header template file was not found.")
 
     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
 ##
 
-edk2-pytool-library==0.15.3
-edk2-pytool-extensions~=0.23.10
+edk2-pytool-library==0.19.3
+edk2-pytool-extensions~=0.25.1
 edk2-basetools==0.1.48
 antlr4-python3-runtime==4.7.1
 lcov-cobertura==2.0.2
-- 
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]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH v1 2/2] BaseTools: Plugin: Integration of edk2-pytools

[Joey Vagedes via groups.io]

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 <sean.brogan@microsoft.com>
Cc: Michael Kubacki <mikuback@linux.microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Joey Vagedes <joeyvagedes@gmail.com>
---
 BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py b/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py
index b1544666025e..aa3a2bbcab20 100644
--- a/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py
+++ b/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py
@@ -58,12 +58,12 @@ class DebugMacroCheckBuildPlugin(IUefiBuildPlugin):
         if "no-target" in build_target:
             return 0
 
-        pp = builder.pp.split(os.pathsep)
-        edk2 = Edk2Path(builder.ws, pp)
+        edk2 = builder.edk2path
         package = edk2.GetContainingPackage(
-                            builder.mws.join(builder.ws,
-                                             builder.env.GetValue(
-                                                "ACTIVE_PLATFORM")))
+            builder.edk2path.GetAbsolutePathOnThisSystemFromEdk2RelativePath(
+                builder.env.GetValue("ACTIVE_PLATFORM")
+            )
+        )
         package_path = Path(
                           edk2.GetAbsolutePathOnThisSystemFromEdk2RelativePath(
                                 package))
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
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/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 0/2] Upgrade edk2-pytools to latest

[Rebecca Cran via groups.io]

On 10/27/2023 9:15 AM, Joey Vagedes via groups.io wrote:
> Upgrades edk2-pytool-library to v0.19.3 and edk2-pytool-extensions to v0.25.1
> and performs all necessary integrations as noted in the individual package
> commits.
> 
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Kubacki <mikuback@linux.microsoft.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> 
> Joey Vagedes (2):
>    .pytool: Integration of edk2-pytools
>    BaseTools: Plugin: Integration of edk2-pytools
> 
>   .pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py |  7 ++++---
>   .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py                           | 12 ++++++------
>   BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py  | 10 +++++-----
>   pip-requirements.txt                                                        |  4 ++--
>   4 files changed, 17 insertions(+), 16 deletions(-)
> 

For the series:

Reviewed-by: Rebecca Cran <rebecca@os.amperecomputing.com>

-- 
Rebecca Cran


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#110218): https://edk2.groups.io/g/devel/message/110218
Mute This Topic: https://groups.io/mt/102223493/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 0/2] Upgrade edk2-pytools to latest

[Michael Kubacki]

Series:

Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>

On 10/27/2023 11:15 AM, Joey Vagedes via groups.io wrote:
> Upgrades edk2-pytool-library to v0.19.3 and edk2-pytool-extensions to v0.25.1
> and performs all necessary integrations as noted in the individual package
> commits.
> 
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Kubacki <mikuback@linux.microsoft.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> 
> Joey Vagedes (2):
>    .pytool: Integration of edk2-pytools
>    BaseTools: Plugin: Integration of edk2-pytools
> 
>   .pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py |  7 ++++---
>   .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py                           | 12 ++++++------
>   BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py  | 10 +++++-----
>   pip-requirements.txt                                                        |  4 ++--
>   4 files changed, 17 insertions(+), 16 deletions(-)
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#110224): https://edk2.groups.io/g/devel/message/110224
Mute This Topic: https://groups.io/mt/102223493/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 0/2] Upgrade edk2-pytools to latest

[Joey Vagedes via groups.io]

Thank you for the reviews. Pending any reviews other maintainers of these packages would like to do, this patch series is ready to merge. I've updated the PR with the reviewed-by tags:

https://github.com/tianocore/edk2/pull/4966

Joey

-----Original Message-----
From: Michael Kubacki <mikuback@linux.microsoft.com> 
Sent: Friday, October 27, 2023 10:32 AM
To: devel@edk2.groups.io; Joey Vagedes <joeyvagedes@microsoft.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>
Subject: Re: [edk2-devel] [PATCH v1 0/2] Upgrade edk2-pytools to latest

Series:

Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>

On 10/27/2023 11:15 AM, Joey Vagedes via groups.io wrote:
> Upgrades edk2-pytool-library to v0.19.3 and edk2-pytool-extensions to 
> v0.25.1 and performs all necessary integrations as noted in the 
> individual package commits.
> 
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Kubacki <mikuback@linux.microsoft.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> 
> Joey Vagedes (2):
>    .pytool: Integration of edk2-pytools
>    BaseTools: Plugin: Integration of edk2-pytools
> 
>   .pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py |  7 ++++---
>   .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py                           | 12 ++++++------
>   BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py  | 10 +++++-----
>   pip-requirements.txt                                                        |  4 ++--
>   4 files changed, 17 insertions(+), 16 deletions(-)
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#110225): https://edk2.groups.io/g/devel/message/110225
Mute This Topic: https://groups.io/mt/102223493/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 0/2] Upgrade edk2-pytools to latest

[Laszlo Ersek]

On 10/27/23 19:41, Joey Vagedes via groups.io wrote:
> Thank you for the reviews. Pending any reviews other maintainers of these packages would like to do, this patch series is ready to merge. I've updated the PR with the reviewed-by tags:
> 
> https://github.com/tianocore/edk2/pull/4966

I figured I could try just adding the push label to your PR, but the
master branch had advanced meanwhile... So I've now picked up your
patches from the list, added the R-b tags, compared the new branch
against yours from the PR, and then created a new PR, with the "push"
label set:

https://github.com/tianocore/edk2/pull/4972

Hopefully this will complete.

Laszlo

> 
> Joey
> 
> -----Original Message-----
> From: Michael Kubacki <mikuback@linux.microsoft.com> 
> Sent: Friday, October 27, 2023 10:32 AM
> To: devel@edk2.groups.io; Joey Vagedes <joeyvagedes@microsoft.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>
> Subject: Re: [edk2-devel] [PATCH v1 0/2] Upgrade edk2-pytools to latest
> 
> Series:
> 
> Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> On 10/27/2023 11:15 AM, Joey Vagedes via groups.io wrote:
>> Upgrades edk2-pytool-library to v0.19.3 and edk2-pytool-extensions to 
>> v0.25.1 and performs all necessary integrations as noted in the 
>> individual package commits.
>>
>> Cc: Sean Brogan <sean.brogan@microsoft.com>
>> Cc: Michael Kubacki <mikuback@linux.microsoft.com>
>> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>> Cc: Liming Gao <gaoliming@byosoft.com.cn>
>>
>> Joey Vagedes (2):
>>    .pytool: Integration of edk2-pytools
>>    BaseTools: Plugin: Integration of edk2-pytools
>>
>>   .pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py |  7 ++++---
>>   .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py                           | 12 ++++++------
>>   BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py  | 10 +++++-----
>>   pip-requirements.txt                                                        |  4 ++--
>>   4 files changed, 17 insertions(+), 16 deletions(-)
>>
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#110247): https://edk2.groups.io/g/devel/message/110247
Mute This Topic: https://groups.io/mt/102223493/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 0/2] Upgrade edk2-pytools to latest

[Laszlo Ersek]

On 10/28/23 16:20, Laszlo Ersek wrote:
> On 10/27/23 19:41, Joey Vagedes via groups.io wrote:
>> Thank you for the reviews. Pending any reviews other maintainers of these packages would like to do, this patch series is ready to merge. I've updated the PR with the reviewed-by tags:
>>
>> https://github.com/tianocore/edk2/pull/4966
> 
> I figured I could try just adding the push label to your PR, but the
> master branch had advanced meanwhile... So I've now picked up your
> patches from the list, added the R-b tags, compared the new branch
> against yours from the PR, and then created a new PR, with the "push"
> label set:
> 
> https://github.com/tianocore/edk2/pull/4972
> 
> Hopefully this will complete.

It did: commit range 7ff6ab2b3e09..7806713f00e9.

Laszlo



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#110249): https://edk2.groups.io/g/devel/message/110249
Mute This Topic: https://groups.io/mt/102223493/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-