Skip to content

Commit d51e0bb

Browse files
authored
Merge pull request #706 from bastelfreak/testsfoo
CI: Dont pin pip to an outdated version and don't force python3 package installation
2 parents 647a8fc + cad5b1b commit d51e0bb

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

spec/acceptance/pip_spec.rb

+1-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class { 'python':
1414
ensure => 'present',
1515
systempkgs => false,
1616
mode => '0755',
17-
pip_version => '<= 20.3.4',
1817
}
1918
2019
python::pip { 'agent package':
@@ -47,7 +46,6 @@ class { 'python':
4746
ensure => 'present',
4847
systempkgs => false,
4948
mode => '0755',
50-
pip_version => '<= 20.3.4',
5149
}
5250
5351
python::pip { 'agent package install':
@@ -78,15 +76,13 @@ class { 'python':
7876
it 'throws an error' do
7977
pp = <<-PUPPET
8078
class { 'python':
81-
version => '3',
82-
dev => 'present',
79+
dev => 'present',
8380
}
8481
8582
python::pyvenv { '/opt/test-venv':
8683
ensure => 'present',
8784
systempkgs => false,
8885
mode => '0755',
89-
pip_version => '<= 20.3.4',
9086
}
9187
9288
python::pip { 'agent package':
@@ -116,7 +112,6 @@ class { 'python':
116112
ensure => 'present',
117113
systempkgs => false,
118114
mode => '0755',
119-
pip_version => '<= 20.3.4',
120115
}
121116
122117
python::pip { 'agent package via extra_index':

spec/acceptance/pyvenv_spec.rb

-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class { 'python':
2626
owner => 'agent',
2727
group => 'agent',
2828
mode => '0755',
29-
pip_version => '<= 20.3.4',
3029
}
3130
PUPPET
3231

@@ -58,7 +57,6 @@ class { 'python':
5857
owner => 'agent',
5958
group => 'agent',
6059
mode => '0755',
61-
pip_version => '<= 20.3.4',
6260
}
6361
python::pip { 'agent' :
6462
ensure => 'latest',
@@ -98,7 +96,6 @@ class { 'python':
9896
owner => 'agent',
9997
group => 'agent',
10098
mode => '0755',
101-
pip_version => '<= 20.3.4',
10299
}
103100
python::pip { 'agent' :
104101
virtualenv => '/opt/agent/venv',
@@ -135,7 +132,6 @@ class { 'python':
135132
owner => 'agent',
136133
group => 'agent',
137134
mode => '0755',
138-
pip_version => '<= 20.3.4',
139135
}
140136
python::pip { 'agent' :
141137
virtualenv => '/opt/agent/venv',
@@ -172,7 +168,6 @@ class { 'python':
172168
owner => 'agent',
173169
group => 'agent',
174170
mode => '0755',
175-
pip_version => '<= 20.3.4',
176171
}
177172
python::pip { 'agent' :
178173
ensure => '0.1.2',
@@ -220,7 +215,6 @@ class { 'python':
220215
owner => 'agent',
221216
group => 'agent',
222217
mode => '0755',
223-
pip_version => '<= 20.3.4',
224218
python_path => '/usr/bin/mycustompython',
225219
}
226220
python::pip { 'agent' :

0 commit comments

Comments
 (0)