Made the pip package independent from the dev package in the python class and updated version to 1.1.1

fgimian · fgimian · commit 17debdc04506 · 2013-06-04T10:20:46.000+10:00
diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name         'puppet-python'
-version      '1.1.0'
+version      '1.1.1'
 
 author       'Sergey Stankevich'
 license      'Apache License, Version 2.0'
diff --git a/README.md b/README.md
@@ -3,15 +3,16 @@
 
 Puppet module for installing and managing python, pip, virtualenvs and Gunicorn virtual hosts.
 
-**Version 1.1.0 Notes**
+**Version 1.1.1 Notes**
 
-Version 1.1.0 makes several fundamental changes to the core of this module, adding some additional features, improving performance and making operations more robust in general.
+Version 1.1.1 makes several fundamental changes to the core of this module, adding some additional features, improving performance and making operations more robust in general.
 
-Please note that everal changes have been made in v1.1.0 which make manifests incompatible with the previous version.  However, modifying your manifests to suit is trivial.  Please see the notes below.
+Please note that everal changes have been made in v1.1.1 which make manifests incompatible with the previous version.  However, modifying your manifests to suit is trivial.  Please see the notes below.
 
 Currently, the changes you need to make are as follows:
 
 * All pip definitions MUST include the owner field which specifies which user owns the virtualenv that packages will be installed in.  Adding this greatly improves performance and efficiency of this module.
+* You must explicitly specify pip => true in the python class if you want pip installed.  As such, the pip package is now independent of the dev package and so one can exist without the other.
 
 ## Installation
 
@@ -28,6 +29,8 @@ Installs and manages python, python-dev, python-virtualenv and Gunicorn.
 
 **version** - Python version to install. Default: system default
 
+**pip** - Install python-pip. Default: false
+
 **dev** - Install python-dev. Default: false
 
 **virtualenv** - Install python-virtualenv. Default: false
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -7,6 +7,9 @@
 # [*version*]
 #  Python version to install. Default: system default
 #
+# [*pip*]
+#  Install python-pip. Default: false
+#
 # [*dev*]
 #  Install python-dev. Default: false
 #
@@ -20,6 +23,7 @@
 #
 # class { 'python':
 #   version    => 'system',
+#   pip        => true,
 #   dev        => true,
 #   virtualenv => true,
 #   gunicorn   => true,
@@ -31,6 +35,7 @@
 #
 class python (
   $version    = 'system',
+  $pip        = false,
   $dev        = false,
   $virtualenv = false,
   $gunicorn   = false
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -17,7 +17,13 @@
     default => absent,
   }
 
-  package { [ $pythondev, 'python-pip' ]: ensure => $dev_ensure }
+  $pip_ensure = $python::pip ? {
+    true    => present,
+    default => absent,
+  }
+
+  package { $pythondev: ensure => $dev_ensure }
+  package { 'python-pip': ensure => $pip_ensure }
 
   $venv_ensure = $python::virtualenv ? {
     true    => present,

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`	`# [version]`
`8`	`8`	`# Python version to install. Default: system default`
`9`	`9`	`#`
	`10`	`+# [pip]`
	`11`	`+# Install python-pip. Default: false`
	`12`	`+#`
`10`	`13`	`# [dev]`
`11`	`14`	`# Install python-dev. Default: false`
`12`	`15`	`#`
`@@ -20,6 +23,7 @@`
`20`	`23`	`#`
`21`	`24`	`# class { 'python':`
`22`	`25`	`# version => 'system',`
	`26`	`+# pip => true,`
`23`	`27`	`# dev => true,`
`24`	`28`	`# virtualenv => true,`
`25`	`29`	`# gunicorn => true,`
`@@ -31,6 +35,7 @@`
`31`	`35`	`#`
`32`	`36`	`class python (`
`33`	`37`	`$version = 'system',`
	`38`	`+ $pip = false,`
`34`	`39`	`$dev = false,`
`35`	`40`	`$virtualenv = false,`
`36`	`41`	`$gunicorn = false`