Normalize Python version in python::pyvenv

Author: Thai Pham

manifests/pyvenv.pp

@@ -41,9 +41,12 @@
         default  => $version,
     }
 
+    $python_version_parts = split($python_version, '[.]')
+    $normalized_python_version = sprintf('%s.%s', $python_version_parts[0], $python_version_parts[1])
+
     # Debian splits the venv module into a seperate package
     if ( $facts['os']['family'] == 'Debian'){
-      $python3_venv_package="python${python_version}-venv"
+      $python3_venv_package="python${normalized_python_version}-venv"
       case $facts['lsbdistcodename'] {
         'xenial','bionic','cosmic','disco',
         'jessie','stretch','buster': {
@@ -57,9 +60,9 @@
 
     # pyvenv is deprecated since 3.6 and will be removed in 3.8
     if (versioncmp($facts['python3_version'], '3.6') >=0) {
-      $virtualenv_cmd = "${python::exec_prefix}python${python_version}  -m venv"
+      $virtualenv_cmd = "${python::exec_prefix}python${normalized_python_version} -m venv"
     } else {
-      $virtualenv_cmd = "${python::exec_prefix}pyvenv-${python_version}"
+      $virtualenv_cmd = "${python::exec_prefix}pyvenv-${normalized_python_version}"
     }
 
     $_path = $::python::provider ? {

spec/defines/pyvenv_spec.rb

@@ -6,7 +6,7 @@
       let :facts do
         # python3 is required to use pyvenv
         facts.merge(
-          python3_version: '3.4'
+          python3_version: '3.5.1'
         )
       end
       let :title do
@@ -15,7 +15,7 @@
 
       it {
         is_expected.to contain_file('/opt/env')
-        is_expected.to contain_exec('python_virtualenv_/opt/env').with_command('pyvenv-3.4 --clear  /opt/env')
+        is_expected.to contain_exec('python_virtualenv_/opt/env').with_command('pyvenv-3.5 --clear  /opt/env')
       }
 
       describe 'when ensure' do