Merge "Fix issue with creating virtualenv"
diff --git a/src/com/mirantis/mk/Python.groovy b/src/com/mirantis/mk/Python.groovy
index 9c9bf88..601f3e0 100644
--- a/src/com/mirantis/mk/Python.groovy
+++ b/src/com/mirantis/mk/Python.groovy
@@ -27,9 +27,10 @@
sh("rm -rf \"${path}\"")
}
- if (offlineDeployment) {
+ // NOTE(vsaienko): unless is fixed in upstream https://github.com/pypa/pip/issues/7620
+ //if (offlineDeployment) {
virtualenv_cmd += " --no-download"
- }
+ //}
common.infoMsg("[Python ${path}] Setup ${python} environment")
sh(returnStdout: true, script: virtualenv_cmd)
if (!offlineDeployment) {
@@ -40,7 +41,7 @@
common.infoMsg("Pinning pip package due to end of life of Python2 to ${pipPackage} version.")
}
// NOTE(vsaienko): pin setuptools explicitly for latest version that works with python2
- runVirtualenvCommand(path, "pip install -U \"setuptools<45.0.0\" ${pipPackage}")
+ runVirtualenvCommand(path, "pip install -U \"setuptools<45.0.0\"")
} catch (Exception e) {
common.warningMsg("Setuptools and pip cannot be updated, you might be offline but OFFLINE_DEPLOYMENT global property not initialized!")
}