diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index 19e0d2ae11..e3ff6e28bc 100644 --- a/.pytool/CISettings.py +++ b/.pytool/CISettings.py @@ -26,18 +26,12 @@ def __init__(self): self.ActualArchitectures = [] self.ActualToolChainTag = "" self.ActualScopes = None - # In tree BaseTools are required for Rust build support so enable - # it by default. - self.UseBuiltInBaseTools = False # ####################################################################################### # # Extra CmdLine configuration # # ####################################################################################### # def AddCommandLineOptions(self, parserObj): - group = parserObj.add_mutually_exclusive_group() - group.add_argument("-force_piptools", "--fpt", dest="force_piptools", action="store_true", default=False, help="Force the system to use pip tools") - try: codeql_helpers.add_command_line_option(parserObj) except NameError: @@ -45,10 +39,6 @@ def AddCommandLineOptions(self, parserObj): def RetrieveCommandLineOptions(self, args): super().RetrieveCommandLineOptions(args) - - if args.force_piptools: - self.UseBuiltInBaseTools = True - try: self.codeql = codeql_helpers.is_codeql_enabled_on_command_line(args) except NameError: @@ -149,12 +139,6 @@ def GetActiveScopes(self): is_linux = GetHostInfo().os.upper() == "LINUX" - if self.UseBuiltInBaseTools == True: - scopes += ('pipbuild-unix',) if is_linux else ('pipbuild-win',) - logging.warning("Using Pip Tools based BaseTools") - else: - logging.info("Using in-tree BaseTools") - if is_linux and self.ActualToolChainTag.upper().startswith("GCC"): if "AARCH64" in self.ActualArchitectures: scopes += ("gcc_aarch64_linux",) diff --git a/pip-requirements.txt b/pip-requirements.txt index f4241df1ae..9a59eae1ba 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -14,7 +14,6 @@ edk2-pytool-library==0.21.2 edk2-pytool-extensions==0.27.2 -edk2-basetools==0.1.29 antlr4-python3-runtime==4.13.1 regex==2023.12.25 pygount==1.6.1