Support Ubuntu 20.04 (#593)

add support for Ubuntu 20.04


Co-authored-by: Tim Meusel <[email protected]>

Author: treydock

manifests/install.pp

@@ -284,8 +284,11 @@
         $pip_package  = 'pip'
         $pip_provider = 'pip'
       } else {
+        $pip_package = $facts['os']['release']['major'] ? {
+          '20.04' => 'python3-pip',
+          default => 'python-pip',
+        }
         $pip_category = undef
-        $pip_package  = 'python-pip'
         $pip_provider = 'pip'
       }
 

manifests/params.pp

@@ -10,7 +10,6 @@
   }
 
   $ensure                      = 'present'
-  $version                     = 'system'
   $pip                         = 'present'
   $dev                         = 'absent'
   $virtualenv                  = 'absent'
@@ -46,4 +45,9 @@
     'RedHat' => 'python-gunicorn',
     default  => 'gunicorn',
   }
+
+  $version = $facts['os']['release']['major'] ? {
+    '20.04' => '3',
+    default => 'system',
+  }
 }

manifests/pyvenv.pp

@@ -46,15 +46,9 @@
     # Debian splits the venv module into a seperate package
     if ( $facts['os']['family'] == 'Debian') {
       $python3_venv_package = "python${normalized_python_version}-venv"
+      ensure_packages($python3_venv_package)
 
-      case $facts['os']['distro']['codename'] {
-        'xenial', 'bionic', 'cosmic', 'disco', 'stretch', 'buster': {
-          ensure_packages($python3_venv_package)
-
-          Package[$python3_venv_package] -> File[$venv_dir]
-        }
-        default: {}
-      }
+      Package[$python3_venv_package] -> File[$venv_dir]
     }
 
     # pyvenv is deprecated since 3.6 and will be removed in 3.8

manifests/virtualenv.pp

@@ -7,7 +7,10 @@
 # @param systempkgs Copy system site-packages into virtualenv.
 # @param venv_dir  Directory to install virtualenv to
 # @param ensure_venv_dir Create $venv_dir
-# @param distribute Include distribute in the virtualenv
+# @param distribute
+#   Include distribute in the virtualenv
+#   Forced to `false` for Ubuntu 18.04 and 20.04
+#   Forced to `false` for RedHat based systems
 # @param index Base URL of Python package index
 # @param owner The owner of the virtualenv being manipulated
 # @param group  The group relating to the virtualenv being manipulated
@@ -93,31 +96,23 @@
       }
     }
 
-    # Virtualenv versions prior to 1.7 do not support the
-    # --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
-    $_virtualenv_version = getvar('virtualenv_version') ? {
-      /.*/ => getvar('virtualenv_version'),
+    $system_pkgs_flag = $systempkgs ? {
+      true    => '--system-site-packages',
       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 {
-      $system_pkgs_flag = '--no-site-packages'
+    # Installing distribute does not work on these operating systems
+    if $facts.dig('os','distro','codename') in ['focal', 'bionic', 'buster'] {
+      $distribute_pkg = 'setuptools'
+    } elsif $facts['os']['family'] == 'RedHat' {
+      $distribute_pkg = 'setuptools'
     } else {
-      $system_pkgs_flag = $systempkgs ? {
-        true    => '--system-site-packages',
-        default => '--no-site-packages',
+      $distribute_pkg = $distribute ? {
+        true     => 'distribute',
+        default  => 'setuptools',
       }
     }
 
-    $distribute_pkg = $distribute ? {
-      true     => 'distribute',
-      default  => 'setuptools',
-    }
-
     $pypi_index = $index ? {
       false   => '',
       default => "-i ${index}",

metadata.json

@@ -42,7 +42,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     },
     {

spec/acceptance/facts_test_spec.rb

@@ -4,7 +4,6 @@
   context 'facts' do
     install_python = <<-EOS
       class { 'python' :
-        version    => 'system',
         pip        => 'present',
         virtualenv => 'present',
       }

spec/acceptance/virtualenv_spec.rb

@@ -32,11 +32,8 @@ class { 'python' :
 
     it 'maintains pip version' do
       pp = <<-EOS
-      if $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '16.04' {
-        $version = '3'
-      } else {
-        $version = 'system'
-      }
+      $version = '3'
+
       class { 'python' :
         version    => $version,
         pip        => 'present',
@@ -61,11 +58,8 @@ class { 'python' :
 
     it 'works with ensure=>latest' do
       pp = <<-EOS
-      if $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '16.04' {
-        $version = '3'
-      } else {
-        $version = 'system'
-      }
+      $version = '3'
+
       class { 'python' :
         version    => $version,
         pip        => 'present',
@@ -92,11 +86,8 @@ class { 'python' :
 
     it 'works with ensure=>latest for package with underscore in its name' do
       pp = <<-EOS
-       if $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '16.04' {
-        $version = '3'
-      } else {
-        $version = 'system'
-      }
+      $version = '3'
+
       class { 'python' :
         version    => $version,
         pip        => 'present',
@@ -123,11 +114,8 @@ class { 'python' :
 
     it 'works with editable=>true' do
       pp = <<-EOS
-      if $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '16.04' {
-        $version = '3'
-      } else {
-        $version = 'system'
-      }
+      $version = '3'
+
       package{ 'git' :
         ensure => 'present',
       }
@@ -157,11 +145,8 @@ class { 'python' :
 
     it 'works with == in pkgname' do
       pp = <<-EOS
-      if $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '16.04' {
-        $version = '3'
-      } else {
-        $version = 'system'
-      }
+      $version = '3'
+
       class { 'python' :
         version    => $version,
         pip        => 'present',

spec/defines/pip_spec.rb

@@ -10,7 +10,8 @@
         kernel: 'Linux',
         lsbdistcodename: 'squeeze',
         os: {
-          family: 'Debian'
+          family: 'Debian',
+          release: { major: '6' },
         },
         osfamily: 'Debian',
         operatingsystem: 'Debian',

spec/defines/virtualenv_spec.rb

@@ -10,18 +10,27 @@
       let :title do
         '/opt/env'
       end
+      let(:distribute_pkg) do
+        if facts[:os]['family'] == 'Debian' && %w[focal bionic buster].include?(facts[:os]['distro']['codename'])
+          'setuptools'
+        elsif facts[:os]['family'] == 'RedHat'
+          'setuptools'
+        else
+          'distribute'
+        end
+      end
 
       context 'with default parameters' do
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_file('/opt/env') }
-        it { is_expected.to contain_exec('python_virtualenv_/opt/env').with_command('virtualenv --no-site-packages -p python /opt/env && /opt/env/bin/pip --log /opt/env/pip.log install  --proxy=  --upgrade pip && /opt/env/bin/pip install  --proxy=  --upgrade distribute') }
+        it { is_expected.to contain_exec('python_virtualenv_/opt/env').with_command("virtualenv  -p python /opt/env && /opt/env/bin/pip --log /opt/env/pip.log install  --proxy=  --upgrade pip && /opt/env/bin/pip install  --proxy=  --upgrade #{distribute_pkg}") }
       end
 
       context 'when virtualenv is defined' do
-        let(:params) {{ virtualenv: 'virtualenv-3' }}
+        let(:params) { { virtualenv: 'virtualenv-3' } }
 
         it { is_expected.to compile.with_all_deps }
-        it { is_expected.to contain_exec('python_virtualenv_/opt/env').with_command(%r{virtualenv-3 --no-site-packages -p python .+}) }
+        it { is_expected.to contain_exec('python_virtualenv_/opt/env').with_command(%r{virtualenv-3  -p python .+}) }
       end
 
       describe 'when ensure' do