Fix issue with PATH in venv

This commit is contained in:
Jim Nicholson 2024-02-13 23:54:23 -08:00
parent 178122d4f6
commit ae067bf6c0

View File

@ -21,7 +21,7 @@ void call(Map config = [:], Closure body) {
venvEnv = [
"VIRTUAL_ENV=${venvDir.join('/')}",
"PATH=${venvBinDir.join('/')}"
"PATH+CUSTOM=${venvBinDir.join('/')}"
]
stage(runConfig.stepName) {
@ -43,23 +43,21 @@ void call(Map config = [:], Closure body) {
if (runConfig.updatePip) {
updateCmd = "${venvPython.join('/')} -m pip install --upgrade pip"
echo "Updating pip with (${updateCmd})"
sh """
env
${updateCmd}
"""
echo "Environment is ${venvEnv}"
sh updateCmd
}
// 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()
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()
}
}
}