summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarl Stefansson <jarl@sdelements.com>2014-01-14 17:02:38 -0500
committerJarl Stefansson <jarl@sdelements.com>2014-01-14 17:02:38 -0500
commit05fc36b8d6f0a9eaeedd72a9dbbbe899aeeed8e2 (patch)
treefdc8f0f58f496e614ec4c3ddff9162ba53517ae3
parent25d7203f8c7c152dcc4ecd75569effebee9ba25a (diff)
Update documentation for python pip
-rw-r--r--manifests/pip.pp18
1 files changed, 13 insertions, 5 deletions
diff --git a/manifests/pip.pp b/manifests/pip.pp
index fb73ae7..367cdb3 100644
--- a/manifests/pip.pp
+++ b/manifests/pip.pp
@@ -85,12 +85,20 @@ define python::pip (
default => "${url}#egg=${egg_name}",
}
- # Python 2.6 and older does not support setuptools/distribute > 0.8 which
- # is required for pip wheel support, pip therefor requires --no-use-wheel flag
- # if the # pip version is more recent than 1.4.1 but using an old python or
- # setuputils/distribute version
+ # We need to jump through hoops to make sure we issue the correct pip command
+ # depending on wheel support and versions.
+ #
+ # Pip does not support wheels prior to version 1.4.0
+ # Pip wheels require setuptools/distribute > 0.8
+ # Python 2.6 and older does not support setuptools/distribute > 0.8
+ # Pip >= 1.5 tries to use wheels by default, even if wheel package is not
+ # installed, in this case the --no-use-wheel flag needs to be passed
+ # Versions prior to 1.5 don't support the --no-use-wheel flag
+ #
# To check for this we test for wheel parameter using help and then using
- # version, this makes sure we only use wheels if they are supported
+ # version, this makes sure we only use wheels if they are supported and
+ # installed
+
case $ensure {
present: {