Merge pull request #418 from Feandil/master

Pip: freeze all to be able to control setuptools, distribute, wheel, pip

Author: bastelfreak

manifests/pip.pp

@@ -215,7 +215,7 @@
     if $ensure != present and $ensure != latest {
       exec { "pip_install_${name}":
         command     => "${wheel_check} ; { ${pip_install} ${install_args} \$wheel_support_flag ${pip_common_args}@${ensure}#egg=${egg_name} || ${pip_install} ${install_args} ${pip_common_args}@${ensure}#egg=${egg_name} ;}",
-        unless      => "${pip_env} freeze | grep -i -e ${grep_regex}",
+        unless      => "${pip_env} freeze --all | grep -i -e ${grep_regex}",
         user        => $owner,
         group       => $group,
         umask       => $umask,
@@ -227,7 +227,7 @@
     } else {
       exec { "pip_install_${name}":
         command     => "${wheel_check} ; { ${pip_install} ${install_args} \$wheel_support_flag ${pip_common_args} || ${pip_install} ${install_args} ${pip_common_args} ;}",
-        unless      => "${pip_env} freeze | grep -i -e ${grep_regex}",
+        unless      => "${pip_env} freeze --all | grep -i -e ${grep_regex}",
         user        => $owner,
         group       => $group,
         umask       => $umask,
@@ -244,7 +244,7 @@
         # Explicit version.
         exec { "pip_install_${name}":
           command     => "${wheel_check} ; { ${pip_install} ${install_args} \$wheel_support_flag ${pip_common_args}==${ensure} || ${pip_install} ${install_args} ${pip_common_args}==${ensure} ;}",
-          unless      => "${pip_env} freeze | grep -i -e ${grep_regex} || ${pip_env} list | sed -e 's/[ ]\\+/==/' -e 's/[()]//g' | grep -i -e ${grep_regex}",
+          unless      => "${pip_env} freeze --all | grep -i -e ${grep_regex} || ${pip_env} list | sed -e 's/[ ]\\+/==/' -e 's/[()]//g' | grep -i -e ${grep_regex}",
           user        => $owner,
           group       => $group,
           umask       => $umask,
@@ -259,7 +259,7 @@
         # Whatever version is available.
         exec { "pip_install_${name}":
           command     => "${wheel_check} ; { ${pip_install} \$wheel_support_flag ${pip_common_args} || ${pip_install} ${pip_common_args} ;}",
-          unless      => "${pip_env} freeze | grep -i -e ${grep_regex} || ${pip_env} list | sed -e 's/[ ]\\+/==/' -e 's/[()]//g' | grep -i -e ${grep_regex}",
+          unless      => "${pip_env} freeze --all | grep -i -e ${grep_regex} || ${pip_env} list | sed -e 's/[ ]\\+/==/' -e 's/[()]//g' | grep -i -e ${grep_regex}",
           user        => $owner,
           group       => $group,
           umask       => $umask,
@@ -289,7 +289,7 @@
         # Anti-action, uninstall.
         exec { "pip_uninstall_${name}":
           command     => "echo y | ${pip_env} uninstall ${uninstall_args} ${proxy_flag} ${name}",
-          onlyif      => "${pip_env} freeze | grep -i -e ${grep_regex}",
+          onlyif      => "${pip_env} freeze --all | grep -i -e ${grep_regex}",
           user        => $owner,
           group       => $group,
           umask       => $umask,

spec/acceptance/virtualenv_spec.rb

@@ -25,6 +25,32 @@ class { 'python' :
       }
       EOS
 
+      # Run it twice and test for idempotency
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
+    end
+    it 'maintains pip version' do
+      pp = <<-EOS
+      class { 'python' :
+        version    => 'system',
+        pip        => 'present',
+        virtualenv => 'present',
+      }
+      ->
+      python::virtualenv { 'venv' :
+        ensure     => 'present',
+        systempkgs => false,
+        venv_dir   => '/opt/venv2',
+        owner      => 'root',
+        group      => 'root',
+      }
+      ->
+      python::pip { 'pip' :
+        ensure     => '18.0',
+        virtualenv => '/opt/venv2',
+      }
+      EOS
+
       # Run it twice and test for idempotency
       apply_manifest(pp, catch_failures: true)
       apply_manifest(pp, catch_changes: true)