allow all python versions

jradmacher · jradmacher · commit e784147a70ef · 2019-02-12T19:05:14.000+01:00
Fixes issue voxpupuli#448, "Impossible to use version number in Ubuntu 16.04" 1) It does not make sense to restrict the allowed python versions per distribution. Newer distribution releases add new python versions and you can add repositories containing backports. 2) The List was outdated. Note: python version is needed for spec test
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -61,9 +61,9 @@
     default => '',
   }
 
-  $allowed_versions = concat(['system', 'pypy'], $valid_versions)
-  unless $version =~ Enum[$allowed_versions] {
-    fail("version needs to be within${allowed_versions}")
+  unless $version =~ Pattern[/\A(python)?[0-9](\.[0-9])+/,
+        /\Apypy\Z/, /\Asystem\Z/] {
+    fail("version needs to be pypy, system or a version string like '3.5' or 'python3.5)")
   }
 
   # Module compatibility check
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -10,7 +10,8 @@
   $python = $python_version ? {
     'system' => 'python',
     'pypy'   => 'pypy',
-    default  => "${python_version}", # lint:ignore:only_variable_string
+    /\A(python)?([0-9](\.?[0-9])+)/ => "python${1}",
+    default  => "python${python::version}",
   }
 
   $pythondev = $facts['os']['family'] ? {
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -12,13 +12,7 @@
   $gunicorn               = 'absent'
   $manage_gunicorn        = true
   $provider               = undef
-  $valid_versions = $::osfamily ? {
-    'RedHat' => ['3','27','33'],
-    'Debian' => ['3', '3.3', '2.7'],
-    'Suse'   => [],
-    'AIX'   => ['python3'],
-    'Gentoo' => ['2.7', '3.3', '3.4', '3.5']
-  }
+  $valid_versions         = undef
 
   if $::osfamily == 'RedHat' {
     if $::operatingsystem != 'Fedora' {
diff --git a/manifests/pyvenv.pp b/manifests/pyvenv.pp
@@ -37,15 +37,15 @@
 
   if $ensure == 'present' {
     $python_version = $version ? {
-        'system' => "$::python3_version",
-        default  => "${version}",
+        'system' => $facts['python3_version'],
+        default  => $version,
     }
 
     # Debian splits the venv module into a seperate package
     if ( $facts['os']['family'] == 'Debian'){
       $python3_venv_package="python${python_version}-venv"
-      case $facts['os']['distro']['codename'] {
-         'xenial','bionic','cosmic','disco',
+      case $facts['lsbdistcodename'] {
+        'xenial','bionic','cosmic','disco',
         'jessie','stretch','buster': {
           package {$python3_venv_package:
             before => File[$venv_dir],
@@ -56,7 +56,7 @@
     }
 
     # pyvenv is deprecated since 3.6 and will be removed in 3.8
-    if (versioncmp($::python3_version, '3.6') >=0) {
+    if (versioncmp($facts['python3_version'], '3.6') >=0) {
       $virtualenv_cmd = "${python::exec_prefix}python${python_version}  -m venv"
     } else {
       $virtualenv_cmd = "${python::exec_prefix}pyvenv-${python_version}"
diff --git a/spec/default_module_facts.yml b/spec/default_module_facts.yml
@@ -0,0 +1,3 @@
+---
+python_version: "2.7"
+python3_version: ~
diff --git a/spec/defines/pyvenv_spec.rb b/spec/defines/pyvenv_spec.rb
@@ -4,15 +4,18 @@
   on_supported_os.each do |os, facts|
     context("on #{os} ") do
       let :facts do
-        facts
+        # python3 is required to use pyvenv
+        facts.merge(
+          python3_version: '3.4'
+        )
       end
       let :title do
         '/opt/env'
       end
 
       it {
         is_expected.to contain_file('/opt/env')
-        is_expected.to contain_exec('python_virtualenv_/opt/env').with_command('pyvenv --clear  /opt/env')
+        is_expected.to contain_exec('python_virtualenv_/opt/env').with_command('pyvenv-3.4 --clear  /opt/env')
       }
 
       describe 'when ensure' do
@@ -28,6 +31,6 @@
           }
         end
       end
-    end
+    end # context
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,9 @@`
`61`	`61`	`default => '',`
`62`	`62`	`}`
`63`	`63`
`64`		`- $allowed_versions = concat(['system', 'pypy'], $valid_versions)`
`65`		`- unless $version =~ Enum[$allowed_versions] {`
`66`		`- fail("version needs to be within${allowed_versions}")`
	`64`	`+ unless $version =~ Pattern[/\A(python)?[0-9](\.[0-9])+/,`
	`65`	`+ /\Apypy\Z/, /\Asystem\Z/] {`
	`66`	`+ fail("version needs to be pypy, system or a version string like '3.5' or 'python3.5)")`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`# Module compatibility check`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@`
`10`	`10`	`$python = $python_version ? {`
`11`	`11`	`'system' => 'python',`
`12`	`12`	`'pypy' => 'pypy',`
`13`		`- default => "${python_version}", # lint:ignore:only_variable_string`
	`13`	`+ /\A(python)?([0-9](\.?[0-9])+)/ => "python${1}",`
	`14`	`+ default => "python${python::version}",`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`$pythondev = $facts['os']['family'] ? {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+---`
	`2`	`+python_version: "2.7"`
	`3`	`+python3_version: ~`