From d6bc593245b779dfd5b7f519187decce2289e074 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 26 Nov 2024 21:33:38 +0100 Subject: [PATCH 1/2] CI: Dont pin pip to an outdated version --- spec/acceptance/pip_spec.rb | 4 ---- spec/acceptance/pyvenv_spec.rb | 6 ------ 2 files changed, 10 deletions(-) diff --git a/spec/acceptance/pip_spec.rb b/spec/acceptance/pip_spec.rb index 5b64c6de..4c4af6cf 100644 --- 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': @@ -86,7 +84,6 @@ class { 'python': ensure => 'present', systempkgs => false, mode => '0755', - pip_version => '<= 20.3.4', } python::pip { 'agent package': @@ -116,7 +113,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 index 0b20e27f..263e4a40 100644 --- 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' : From cad5b1b86ae028dbe5f6590aba43aaaf3df440d7 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 26 Nov 2024 21:56:34 +0100 Subject: [PATCH 2/2] CI: Dont set python version --- spec/acceptance/pip_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/acceptance/pip_spec.rb b/spec/acceptance/pip_spec.rb index 4c4af6cf..83a639fa 100644 --- a/spec/acceptance/pip_spec.rb +++ b/spec/acceptance/pip_spec.rb @@ -76,8 +76,7 @@ class { 'python': it 'throws an error' do pp = <<-PUPPET class { 'python': - version => '3', - dev => 'present', + dev => 'present', } python::pyvenv { '/opt/test-venv':