feat: Add arguments to pipupgrade and fix enable_pipupgrade check (#448)
This commit is contained in:
@@ -113,6 +113,7 @@
|
|||||||
#enable_pip_review = true ###disabled by default
|
#enable_pip_review = true ###disabled by default
|
||||||
#enable_pip_review_local = true ###disabled by default
|
#enable_pip_review_local = true ###disabled by default
|
||||||
#enable_pipupgrade = true ###disabled by default
|
#enable_pipupgrade = true ###disabled by default
|
||||||
|
#pipupgrade_arguments = "-y -u --pip-path pip" ###disabled by default
|
||||||
|
|
||||||
[windows]
|
[windows]
|
||||||
# Manually select Windows updates
|
# Manually select Windows updates
|
||||||
|
|||||||
@@ -243,6 +243,7 @@ pub struct Python {
|
|||||||
enable_pip_review: Option<bool>,
|
enable_pip_review: Option<bool>,
|
||||||
enable_pip_review_local: Option<bool>,
|
enable_pip_review_local: Option<bool>,
|
||||||
enable_pipupgrade: Option<bool>,
|
enable_pipupgrade: Option<bool>,
|
||||||
|
pipupgrade_arguments: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize, Default, Debug, Merge)]
|
#[derive(Deserialize, Default, Debug, Merge)]
|
||||||
@@ -1462,6 +1463,13 @@ impl Config {
|
|||||||
.and_then(|python| python.enable_pipupgrade)
|
.and_then(|python| python.enable_pipupgrade)
|
||||||
.unwrap_or(false);
|
.unwrap_or(false);
|
||||||
}
|
}
|
||||||
|
pub fn pipupgrade_arguments(&self) -> &str {
|
||||||
|
self.config_file
|
||||||
|
.python
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|s| s.pipupgrade_arguments.as_deref())
|
||||||
|
.unwrap_or("")
|
||||||
|
}
|
||||||
pub fn enable_pip_review(&self) -> bool {
|
pub fn enable_pip_review(&self) -> bool {
|
||||||
return self
|
return self
|
||||||
.config_file
|
.config_file
|
||||||
|
|||||||
@@ -444,17 +444,19 @@ pub fn run_pipupgrade_update(ctx: &ExecutionContext) -> Result<()> {
|
|||||||
let pipupgrade = require("pipupgrade")?;
|
let pipupgrade = require("pipupgrade")?;
|
||||||
|
|
||||||
print_separator("Pipupgrade");
|
print_separator("Pipupgrade");
|
||||||
if !ctx.config().enable_pip_review() {
|
if !ctx.config().enable_pipupgrade() {
|
||||||
print_warning(
|
print_warning(
|
||||||
"Pipupgrade is disabled by default. Enable it by setting enable_pipupgrade=true in the configuration.",
|
"Pipupgrade is disabled by default. Enable it by setting enable_pipupgrade=true in the configuration.",
|
||||||
);
|
);
|
||||||
return Err(SkipStep(String::from("Pipupgrade is disabled by default")).into());
|
return Err(SkipStep(String::from("Pipupgrade is disabled by default")).into());
|
||||||
}
|
}
|
||||||
ctx.run_type().execute(pipupgrade).status_checked()?;
|
ctx.run_type()
|
||||||
|
.execute(pipupgrade)
|
||||||
|
.args(ctx.config().pipupgrade_arguments().split_whitespace())
|
||||||
|
.status_checked()?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn run_stack_update(ctx: &ExecutionContext) -> Result<()> {
|
pub fn run_stack_update(ctx: &ExecutionContext) -> Result<()> {
|
||||||
if require("ghcup").is_ok() {
|
if require("ghcup").is_ok() {
|
||||||
// `ghcup` is present and probably(?) being used to install `stack`.
|
// `ghcup` is present and probably(?) being used to install `stack`.
|
||||||
|
|||||||
Reference in New Issue
Block a user