diff --git a/vars/pythonVenvStage.groovy b/vars/pythonVenvStage.groovy index 1d18b54..9dae366 100644 --- a/vars/pythonVenvStage.groovy +++ b/vars/pythonVenvStage.groovy @@ -41,22 +41,25 @@ void call(Map config = [:], Closure body) { withEnv(venvEnv) { if (runConfig.updatePip) { - updateCmd = "${venvPython} -m pip install --upgrade pip" + updateCmd = "${venvPython.join('/')} -m pip install --upgrade pip" echo "Updating pip with (${updateCmd})" - sh updateCmd + sh """ + env + ${updateCmd} + """ } - if (runConfig.installPipTools) { - installCmd = "${venvPython} -m pip install pip-tools" - echo "Installing pip-tools with (${installCmd})" - sh installCmd - } - if (fileExists(runConfig.requirementsFile)) { - reqCmd = "pip-compile ${runConfig.requirementsFile}" - echo "Collecting requirements with (${reqCmd})" - sh reqCmd - } - echo 'Executing closure...' - body() + // if (runConfig.installPipTools) { + // installCmd = "${venvPython.join('/')} -m pip install pip-tools" + // echo "Installing pip-tools with (${installCmd})" + // sh installCmd + // } + // if (fileExists(runConfig.requirementsFile)) { + // reqCmd = "pip-compile ${runConfig.requirementsFile}" + // echo "Collecting requirements with (${reqCmd})" + // sh reqCmd + // } + // echo 'Executing closure...' + // body() } } }