diff options
author | Oliver Smith-Denny <osde@linux.microsoft.com> | 2024-09-04 10:02:09 -0700 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-09-10 00:41:53 +0000 |
commit | 61f9695f20a575085d0579a0d3efc41b322ce1ac (patch) | |
tree | dc2786b3cec050cf070e08f364575d2b1cb3130e /.pytool | |
parent | 3885a3edad618861168fe7081027867f1753ed42 (diff) | |
download | edk2-61f9695f20a575085d0579a0d3efc41b322ce1ac.tar.gz |
BaseTools: Remove Pip BaseTools
BaseTools was moved out to a separate repo and consumed as a pip
module by edk2 CI. This process has not led to the desired goals
of doing so, so this patch removes the pip based BaseTools from
edk2 CI.
The original goal of moving BaseTools to a pip module was
primarily to speed up the development process, as the old edk2
mailing list was slow. However, with edk2 moving to PRs, it now
actually slows the BaseTools development process to have to do
a PR in another repo, publish the module, and then make a PR
in edk2 to consume the new BaseTools. It also holds up using
the features in a new BaseTools in other PRs.
There were other goals of moving, such as allowing projects to
use the BaseTools outside of edk2. This can still be accomplished
outside of this PR, this PR simply stops edk2 CI from using the
pip module.
Continuous-integration-options: PatchCheck.ignore-multi-package
Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
Diffstat (limited to '.pytool')
-rw-r--r-- | .pytool/CISettings.py | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index 314758da32..e14b77d4e2 100644 --- a/.pytool/CISettings.py +++ b/.pytool/CISettings.py @@ -37,7 +37,6 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag self.ActualTargets = []
self.ActualArchitectures = []
self.ActualToolChainTag = ""
- self.UseBuiltInBaseTools = None
self.ActualScopes = None
# ####################################################################################### #
@@ -45,10 +44,6 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag # ####################################################################################### #
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")
- group.add_argument("-no_piptools", "--npt", dest="no_piptools", action="store_true", default=False, help="Force the system to not use pip tools")
-
try:
codeql_helpers.add_command_line_option(parserObj)
except NameError:
@@ -56,10 +51,6 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag def RetrieveCommandLineOptions(self, args):
super().RetrieveCommandLineOptions(args)
- if args.force_piptools:
- self.UseBuiltInBaseTools = True
- if args.no_piptools:
- self.UseBuiltInBaseTools = False
try:
self.codeql = codeql_helpers.is_codeql_enabled_on_command_line(args)
@@ -176,24 +167,6 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag self.ActualToolChainTag = shell_environment.GetBuildVars().GetValue("TOOL_CHAIN_TAG", "")
- is_linux = GetHostInfo().os.upper() == "LINUX"
-
- if self.UseBuiltInBaseTools is None:
- is_linux = GetHostInfo().os.upper() == "LINUX"
- # try and import the pip module for basetools
- try:
- import edk2basetools
- self.UseBuiltInBaseTools = True
- except ImportError:
- self.UseBuiltInBaseTools = False
- pass
-
- if self.UseBuiltInBaseTools == True:
- scopes += ('pipbuild-unix',) if is_linux else ('pipbuild-win',)
- logging.warning("Using Pip Tools based BaseTools")
- else:
- logging.warning("Falling back to using in-tree BaseTools")
-
try:
scopes += codeql_helpers.get_scopes(self.codeql)
|