manifests/install.pp

@@ -18,7 +18,7 @@
   $python = $::python::version ? {
     'system' => 'python',
     'pypy'   => 'pypy',
-    default  => $python::version,
+    default  => "python${python::version}",
   }
 
   $pythondev = $::osfamily ? {
@@ -71,7 +71,7 @@
       # Install pip without pip, see https://pip.pypa.io/en/stable/installing/.
       exec { 'bootstrap pip':
         command => '/usr/bin/curl https://bootstrap.pypa.io/get-pip.py | python',
-        unless  => '/usr/bin/which pip',
+        creates => '/usr/local/bin/pip',
         require => Package['python'],
       }
 

manifests/virtualenv.pp

@@ -116,9 +116,13 @@
     # --system-site-packages flag, default off for prior versions
     # Prior to version 1.7 the default was equal to --system-site-packages
     # and the flag --no-site-packages had to be passed to do the opposite
-    if (( versioncmp("${::virtualenv_version}",'1.7') > 0 ) and ( $systempkgs == true )) { # lint:ignore:only_variable_string
+    $_virtualenv_version = getvar('virtualenv_version') ? {
+      /.*/ => getvar('virtualenv_version'),
+      default => '',
+    }
+    if (( versioncmp($_virtualenv_version,'1.7') > 0 ) and ( $systempkgs == true )) {
       $system_pkgs_flag = '--system-site-packages'
-    } elsif (( versioncmp("${::virtualenv_version}",'1.7') < 0 ) and ( $systempkgs == false )) { # lint:ignore:only_variable_string
+    } elsif (( versioncmp($_virtualenv_version,'1.7') < 0 ) and ( $systempkgs == false )) {
       $system_pkgs_flag = '--no-site-packages'
     } else {
       $system_pkgs_flag = $systempkgs ? {

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "stankevich-python",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "author": "stankevich",
   "summary": "Python Module",
   "license": "Apache-2.0",

tests/gunicorn.pp

@@ -12,7 +12,9 @@
   bind        => 'unix:/tmp/gunicorn.socket',
   environment => 'prod',
   appmodule   => 'app:app',
-  osenv       => { 'DBHOST' => 'dbserver.example.com' },
+  osenv       => {
+    'DBHOST' => 'dbserver.example.com'
+  },
   timeout     => 30,
   template    => 'python/gunicorn.erb',
 }

tests/pyvenv.pp

@@ -3,10 +3,10 @@
   version => '3',
 }
 
-python::pyvenv { "/opt/uwsgi":
+python::pyvenv { '/opt/uwsgi':
 }
 
-python::pip { "uwsgi":
-  ensure     => "latest",
-  virtualenv => "/opt/uwsgi"
+python::pip { 'uwsgi':
+  ensure     => 'latest',
+  virtualenv => '/opt/uwsgi'
 }