diff options
| -rw-r--r-- | .pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py | 7 | ||||
| -rw-r--r-- | .pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py | 12 | ||||
| -rw-r--r-- | 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 8a8883edf4..164c8d4b7f 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 ffc72f2c59..9aeef5a5a3 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 a722dd3ac0..8177c60d18 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
|