Merge pull request #706 from bastelfreak/testsfoo

CI: Dont pin pip to an outdated version and don't force python3 package installation
voxpupuli · Nov 26, 2024 · d51e0bb · d51e0bb
2 parents 647a8fc + cad5b1b
commit d51e0bb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/spec/acceptance/pip_spec.rb b/spec/acceptance/pip_spec.rb
@@ -14,7 +14,6 @@ class { 'python':
         ensure      => 'present',
         systempkgs  => false,
         mode        => '0755',
-        pip_version => '<= 20.3.4',
       }
 
       python::pip { 'agent package':
@@ -47,7 +46,6 @@ class { 'python':
         ensure      => 'present',
         systempkgs  => false,
         mode        => '0755',
-        pip_version => '<= 20.3.4',
       }
 
       python::pip { 'agent package install':
@@ -78,15 +76,13 @@ class { 'python':
     it 'throws an error' do
       pp = <<-PUPPET
       class { 'python':
-        version => '3',
-        dev     => 'present',
+        dev => 'present',
       }
 
       python::pyvenv { '/opt/test-venv':
         ensure      => 'present',
         systempkgs  => false,
         mode        => '0755',
-        pip_version => '<= 20.3.4',
       }
 
       python::pip { 'agent package':
@@ -116,7 +112,6 @@ class { 'python':
         ensure      => 'present',
         systempkgs  => false,
         mode        => '0755',
-        pip_version => '<= 20.3.4',
       }
 
       python::pip { 'agent package via extra_index':

diff --git a/spec/acceptance/pyvenv_spec.rb b/spec/acceptance/pyvenv_spec.rb
@@ -26,7 +26,6 @@ class { 'python':
         owner       => 'agent',
         group       => 'agent',
         mode        => '0755',
-        pip_version => '<= 20.3.4',
       }
       PUPPET
 
@@ -58,7 +57,6 @@ class { 'python':
         owner       => 'agent',
         group       => 'agent',
         mode        => '0755',
-        pip_version => '<= 20.3.4',
       }
       python::pip { 'agent' :
         ensure       => 'latest',
@@ -98,7 +96,6 @@ class { 'python':
         owner       => 'agent',
         group       => 'agent',
         mode        => '0755',
-        pip_version => '<= 20.3.4',
       }
       python::pip { 'agent' :
         virtualenv => '/opt/agent/venv',
@@ -135,7 +132,6 @@ class { 'python':
         owner       => 'agent',
         group       => 'agent',
         mode        => '0755',
-        pip_version => '<= 20.3.4',
       }
       python::pip { 'agent' :
         virtualenv => '/opt/agent/venv',
@@ -172,7 +168,6 @@ class { 'python':
         owner       => 'agent',
         group       => 'agent',
         mode        => '0755',
-        pip_version => '<= 20.3.4',
       }
       python::pip { 'agent' :
         ensure     => '0.1.2',
@@ -220,7 +215,6 @@ class { 'python':
         owner       => 'agent',
         group       => 'agent',
         mode        => '0755',
-        pip_version => '<= 20.3.4',
         python_path => '/usr/bin/mycustompython',
       }
       python::pip { 'agent' :