From 899219bdfbd66d07c2071b885ce31c9fa01a5fa1 Mon Sep 17 00:00:00 2001 From: peardox Date: Sun, 14 Aug 2022 14:57:43 +0100 Subject: [PATCH 1/2] Correct OnlyBinary, add Verbose --- .../Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas | 11 +++++++++-- .../Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas | 6 ++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Manager/Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas b/src/Manager/Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas index b64afc5..f7bebba 100644 --- a/src/Manager/Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas +++ b/src/Manager/Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas @@ -72,6 +72,7 @@ TPyPackageManagerCmdPipInstall = class function MakeInstallNoWarnConflictsCmd: TArray; inline; function MakeInstallNoBinaryCmd: TArray; inline; function MakeInstallOnlyBinaryCmd: TArray; inline; + function MakeInstallVerboseCmd: TArray; inline; function MakeInstallPreferBinaryCmd: TArray; inline; function MakeInstallRequireHashesCmd: TArray; inline; function MakeInstallProgressBarCmd: TArray; inline; @@ -236,8 +237,14 @@ function TPyPackageManagerCmdPipInstall.MakeInstallNoWarnScriptLocationCmd: TArr function TPyPackageManagerCmdPipInstall.MakeInstallOnlyBinaryCmd: TArray; begin - if FOpts.OnlyBinary then - Result := TArray.Create('--only-binary'); + if not FOpts.OnlyBinary.IsEmpty() then + Result := TArray.Create('--only-binary', FOpts.OnlyBinary); +end; + +function TPyPackageManagerCmdPipInstall.MakeInstallVerboseCmd: TArray; +begin + if FOpts.Verbose then + Result := TArray.Create('-v'); end; function TPyPackageManagerCmdPipInstall.MakeInstallPlatformCmd: TArray; diff --git a/src/Manager/Defs/Opts/Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas b/src/Manager/Defs/Opts/Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas index 4507aae..d7207a4 100644 --- a/src/Manager/Defs/Opts/Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas +++ b/src/Manager/Defs/Opts/Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas @@ -67,7 +67,8 @@ TPyPackageManagerDefsOptsPipInstall = class(TPyPackageManagerDefsOpts) FNoWarnConflicts: boolean; FNoBinary: boolean; FNoCompile: boolean; - FOnlyBinary: boolean; + FVerbose: boolean; + FOnlyBinary: String; FPreferBinary: boolean; FRequireHashes: boolean; FProgressBar: boolean; @@ -110,7 +111,8 @@ TPyPackageManagerDefsOptsPipInstall = class(TPyPackageManagerDefsOpts) property NoWarnScriptLocation: boolean read FNoWarnScriptLocation write FNoWarnScriptLocation default false; property NoWarnConflicts: boolean read FNoWarnConflicts write FNoWarnConflicts default false; property NoBinary: boolean read FNoBinary write FNoBinary default false; - property OnlyBinary: boolean read FOnlyBinary write FOnlyBinary default false; + property Verbose: boolean read FVerbose write FVerbose default false; + property OnlyBinary: String read FOnlyBinary write FOnlyBinary; property PreferBinary: boolean read FPreferBinary write FPreferBinary default false; property RequireHashes: boolean read FRequireHashes write FRequireHashes default false; property ProgressBar: boolean read FProgressBar write FProgressBar default false; From 6571644038f714f7aa936884169d5d330a084207 Mon Sep 17 00:00:00 2001 From: peardox Date: Mon, 15 Aug 2022 04:46:56 +0100 Subject: [PATCH 2/2] Add report switch to pip --- src/Manager/Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas | 7 +++++++ .../Opts/Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/Manager/Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas b/src/Manager/Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas index f7bebba..86f7abe 100644 --- a/src/Manager/Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas +++ b/src/Manager/Cmd/Pip/PyPackage.Manager.Cmd.Pip.Install.pas @@ -73,6 +73,7 @@ TPyPackageManagerCmdPipInstall = class function MakeInstallNoBinaryCmd: TArray; inline; function MakeInstallOnlyBinaryCmd: TArray; inline; function MakeInstallVerboseCmd: TArray; inline; + function MakeInstallReportCmd: TArray; inline; function MakeInstallPreferBinaryCmd: TArray; inline; function MakeInstallRequireHashesCmd: TArray; inline; function MakeInstallProgressBarCmd: TArray; inline; @@ -253,6 +254,12 @@ function TPyPackageManagerCmdPipInstall.MakeInstallPlatformCmd: TArray; Result := TArray.Create('--platform ', FOpts.Platform); end; +function TPyPackageManagerCmdPipInstall.MakeInstallReportCmd: TArray; +begin + if not FOpts.Report.IsEmpty() then + Result := TArray.Create('--report ', FOpts.Report); +end; + function TPyPackageManagerCmdPipInstall.MakeInstallPreCmd: TArray; begin if FOpts.Pre then diff --git a/src/Manager/Defs/Opts/Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas b/src/Manager/Defs/Opts/Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas index d7207a4..f8f1bf8 100644 --- a/src/Manager/Defs/Opts/Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas +++ b/src/Manager/Defs/Opts/Pip/PyPackage.Manager.Defs.Opts.Pip.Install.pas @@ -68,6 +68,7 @@ TPyPackageManagerDefsOptsPipInstall = class(TPyPackageManagerDefsOpts) FNoBinary: boolean; FNoCompile: boolean; FVerbose: boolean; + FReport: String; FOnlyBinary: String; FPreferBinary: boolean; FRequireHashes: boolean; @@ -113,6 +114,7 @@ TPyPackageManagerDefsOptsPipInstall = class(TPyPackageManagerDefsOpts) property NoBinary: boolean read FNoBinary write FNoBinary default false; property Verbose: boolean read FVerbose write FVerbose default false; property OnlyBinary: String read FOnlyBinary write FOnlyBinary; + property Report: String read FReport write FReport; property PreferBinary: boolean read FPreferBinary write FPreferBinary default false; property RequireHashes: boolean read FRequireHashes write FRequireHashes default false; property ProgressBar: boolean read FProgressBar write FProgressBar default false;