New intallation options

Former-commit-id: 97883c3d67a0aeb509801fc2436f4578011bd9c6 [formerly c2585066c9b17f735f1bf68672c6f283c6f4518d] [formerly e20075ac8f4d92ca1ee00657710ec3b4a21c6d8d [formerly d4a10a66a21336fb75e9cf118492eb6d7ef8b43b]] [formerly 8d9ee2118594b45cb667fe2f59a76f5cdf185426 [formerly 7d362962354d170fadee68316f756114f27d5616] [formerly 10fd2f623d53eabbf97ef0040401c6654a93b76a [formerly da746df033331e722831a38ac23eb09f3a783c97]]]
Former-commit-id: 6dbcef332d477447fa49339246c5d452acc60418 [formerly 69699bb1792c02fad7cbed6cec1ee443b0d7f7a4] [formerly 5cb879ce713a47c23604709bc854be5fe62edaf8 [formerly 10effd1a204cab4f6496b5b6df58fe83c78f8181]]
Former-commit-id: c195df32e15d09e083c6077fbfe0d8f398b8cd78 [formerly e93f078637293ab88c0d4b04f4801d4ee64109d2]
Former-commit-id: 643144e2ec65e5279dd2a496908edf676b1e0ee8
Former-commit-id: 1ed662b

Author: lmbelo

src/AddOn/PyEnvironment.AddOn.EnsurePip.pas

@@ -42,6 +42,9 @@ interface
 type
   [ComponentPlatforms(pidAllPlatforms)]
   TPyEnvironmentAddOnEnsurePip = class(TPyEnvironmentCustomAddOn)
+  private
+    FVerbose: boolean;
+    FUpgrade: boolean;
   protected
     function GetInfo(): TPyPluginInfo; override;
     function IsInstalled(): boolean; override;
@@ -51,6 +54,8 @@   TPyEnvironmentAddOnEnsurePip = class(TPyEnvironmentCustomAddOn)
     constructor Create(AOwner: TComponent); override;
   published
     property Triggers default [TPyEnvironmentaddOnTrigger.trAfterSetup];
+    property Verbose: boolean read FVerbose write FVerbose;
+    property Upgrade: boolean read FUpgrade write FUpgrade;
   end;
 
 implementation
@@ -119,6 +124,7 @@ procedure TPyEnvironmentAddOnEnsurePip.InternalExecute(
   LPythonHome: string;
   LExecutable: string;
   LSharedLibrary: string;
+  LInput: TArray<string>;
   LCmd: IExecCmd;
 begin
   inherited;
@@ -127,15 +133,23 @@ procedure TPyEnvironmentAddOnEnsurePip.InternalExecute(
   LSharedLibrary := TPath.Combine(GetPythonEngine().DllPath,
     GetPythonEngine().DllName);
 
+  LInput := ['-m', 'ensurepip'];
+
+  if FVerbose then
+    LInput := LInput + ['--verbose'];
+
+  if FUpgrade then
+    LInput := LInput + ['--upgrade'];
+
   LCmd := TExecCmdService.Cmd(
     LExecutable,
     TExecCmdArgs.BuildArgv(
-      LExecutable, ['-m', 'ensurepip']),
+      LExecutable, LInput),
     TExecCmdArgs.BuildEnvp(
       LPythonHome,
       LExecutable,
       LSharedLibrary))
-    .Run([TRedirect.stderr]);
+    .Run([TRedirect.stdout, TRedirect.stderr]);
 
   TSpinWait.SpinUntil(function(): boolean begin
     Result := not LCmd.IsAlive or ACancelation.IsCancelled;
@@ -144,7 +158,9 @@ procedure TPyEnvironmentAddOnEnsurePip.InternalExecute(
   ACancelation.CheckCancelled();
 
   if (LCmd.Wait() <> EXIT_SUCCESS) then
-    raise EPipSetupFailed.Create('PIP setup has failed.' + #13#10 + LCmd.StdErr.ReadAll());
+    raise EPipSetupFailed.Create('PIP setup has failed.'
+      + #13#10
+      + LCmd.Output);
 end;
 
 end.