diff --git a/vars/pythonVenvStage.groovy b/vars/pythonVenvStage.groovy index f5034e9..bf3af0e 100644 --- a/vars/pythonVenvStage.groovy +++ b/vars/pythonVenvStage.groovy @@ -27,33 +27,36 @@ void call(Map config = [:], Closure body) { printBanner(runConfig.stepName) ansiColor('css') { if (fileExists(runConfig.venvDir) && runConfig.recreateVenv) { - echo 'Removing old venv...' + echo 'INFO: Removing old venv from workspace.' dir(runConfig.venvDir) { deleteDir() } } if (!fileExists(runConfig.venvDir)) { - createVenv = "${runConfig.pythonPath} -m venv ${runConfig.venvDir}" - echo "python create venv cmd is: ${createVenv}" - sh createVenv + echo "INFO: Creating new venv in ${runConfig.venvDir}." + sh "${runConfig.pythonPath} -m venv ${runConfig.venvDir}" } withEnv(venvEnv) { List setupCmds = [] if (runConfig.updatePip) { + echo 'INFO: Will update pip if an update is available.' updateCmd = "${venvPython.join('/')} -m pip install --upgrade pip" setupCmds.add(updateCmd) } if (runConfig.installPipTools) { + echo 'INFO: Will install pip-tools.' installCmd = "${venvPython.join('/')} -m pip install pip-tools" setupCmds.add(installCmd) } if (fileExists(runConfig.requirementsFile)) { + echo "INFO: Will resolve requirements from ${runCOnfig.requirementsFile}." reqCmd = "pip-compile ${runConfig.requirementsFile}" setupCmds.add(reqCmd) } if (!setupCmds.isEmpty()) { + echo 'INFO: Beginning venv setup.' sh setupCmds.join('\n') } echo 'Executing closure...'