admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pip should be executed via the regular python executable (#913)

Browse Source 
Fixes #910
This commit is contained in:
Roey Darwish Dror
2022-05-01 20:47:14 +03:00
committed by GitHub
parent 6158a17ba8
commit 5d168bbf0d
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
.vscode/launch.json vendored
View File

@@ -7,7 +7,7 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'topgrade'",
"name": "Topgrade",
"console": "integratedTerminal",
"cargo": {
"args": [
@@ -20,27 +20,19 @@
"kind": "bin"
}
},
"args": [],
"args": [
"--only",
"${input:step}",
"-v"
],
"cwd": "${workspaceFolder}"
},
],
"inputs": [
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'topgrade'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=topgrade",
"--package=topgrade"
],
"filter": {
"name": "topgrade",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
"type": "promptString",
"id": "step",
"description": "step nname",
}
]
}

11
src/steps/generic.rs
View File

@@ -263,7 +263,12 @@ pub fn run_conda_update(ctx: &ExecutionContext) -> Result<()> {
}
pub fn run_pip3_update(run_type: RunType) -> Result<()> {
let pip3 = utils::require("pip3")?;
let python3 = utils::require("python3")?;
Command::new(&python3)
.args(&["-m", "pip"])
.check_output()
.map_err(|_| SkipStep("pip does not exists".to_string()))?;
print_separator("pip3");
if std::env::var("VIRTUAL_ENV").is_ok() {
print_warning("This step is will be skipped when running inside a virtual environment");
@@ -271,8 +276,8 @@ pub fn run_pip3_update(run_type: RunType) -> Result<()> {
}
run_type
.execute(&pip3)
.args(&["install", "--upgrade", "--user", "pip"])
.execute(&python3)
.args(&["-m", "pip", "install", "--upgrade", "--user", "pip"])
.check_run()
}