Skip to content

Commit 24aeabd

Browse files
authored
Merge pull request #746 from voxpupuli/modulesync
modulesync 10.6.0
2 parents 46c7b72 + 4e23f0e commit 24aeabd

File tree

13 files changed

+53
-43
lines changed

13 files changed

+53
-43
lines changed

.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
21
{
32
"name": "VoxBox",
43
"image": "ghcr.io/voxpupuli/voxbox:latest"

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '10.5.0'
5+
modulesync_config_version: '10.6.0'

.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
inherit_from: .rubocop_todo.yml
3+
24
# Managed by modulesync - DO NOT EDIT
35
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
46

.rubocop_todo.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# This configuration was generated by
2+
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
3+
# using RuboCop version 1.85.1.
4+
# The point is for the user to remove these configuration records
5+
# one by one as the offenses are removed from the code base.
6+
# Note that changes in the inspected code, or installation of new
7+
# versions of RuboCop, may require this file to be generated again.
8+
9+
# Offense count: 3
10+
RSpec/LeakyLocalVariable:
11+
Exclude:
12+
- 'spec/acceptance/class_spec.rb'
13+
- 'spec/acceptance/facts_test_spec.rb'

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 13.0', :require => false
7+
gem 'voxpupuli-test', '~> 14.0', :require => false
88
gem 'puppet_metadata', '~> 6.0', :require => false
99
end
1010

@@ -18,7 +18,7 @@ group :system_tests do
1818
end
1919

2020
group :release do
21-
gem 'voxpupuli-release', '~> 5.0', :require => false
21+
gem 'voxpupuli-release', '~> 5.3', :require => false
2222
end
2323

2424
gem 'rake', :require => false

REFERENCE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ Data type: `Python::Version`
9999

100100
The default version of Python provided by the operating system. Only used as a fallback if Python is not installed yet to determine how to handle some actions that vary depending on the Python version used.
101101

102+
Default value: `'3.11'`
103+
102104
##### <a name="-python--ensure"></a>`ensure`
103105

104106
Data type: `Python::Package::Ensure`

spec/classes/python_spec.rb

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
manage_python_package: false,
3737
manage_dev_package: false,
3838
manage_pip_package: false,
39-
manage_venv_package: false
39+
manage_venv_package: false,
4040
}
4141
end
4242

@@ -53,7 +53,7 @@
5353
manage_pip_package: true,
5454
manage_venv_package: true,
5555
pip: 'present',
56-
venv: 'present'
56+
venv: 'present',
5757
}
5858
end
5959

@@ -112,12 +112,12 @@
112112
{
113113
python_pyvenvs: {
114114
'/opt/env1' => {
115-
version: '3.8'
115+
version: '3.8',
116116
},
117117
'/opt/env2' => {
118-
version: '3.8'
119-
}
120-
}
118+
version: '3.8',
119+
},
120+
},
121121
}
122122
end
123123

@@ -139,13 +139,13 @@
139139
python_pyvenvs: {
140140
'/opt/env1' => {
141141
version: '3.8',
142-
pip_version: 'latest'
142+
pip_version: 'latest',
143143
},
144144
'/opt/env2' => {
145145
version: '3.8',
146-
pip_version: '<= 20.3.4'
147-
}
148-
}
146+
pip_version: '<= 20.3.4',
147+
},
148+
},
149149
}
150150
end
151151

@@ -155,43 +155,43 @@
155155
it { is_expected.to contain_python__pyvenv('/opt/env2').with_ensure('present') }
156156

157157
it {
158-
expect(subject).to contain_exec('python_virtualenv_/opt/env1').
159-
with(
158+
expect(subject).to contain_exec('python_virtualenv_/opt/env1')
159+
.with(
160160
command: 'python3.8 -m venv --clear /opt/env1 && /opt/env1/bin/pip install --upgrade pip && /opt/env1/bin/pip install --upgrade setuptools',
161161
user: 'root',
162162
creates: '/opt/env1/bin/activate',
163163
path: [
164164
'/bin',
165165
'/usr/bin',
166166
'/usr/sbin',
167-
'/usr/local/bin'
167+
'/usr/local/bin',
168168
],
169169
cwd: '/tmp',
170170
environment: [],
171171
timeout: 600,
172-
unless: %r{^grep '\^\[\\t \]\*VIRTUAL_ENV=\[\\\\'\\"\]\*/opt/env1\[\\"\\\\'\]\[\\t \]\*\$' /opt/env1/bin/activate$}
173-
).
174-
that_requires('File[/opt/env1]')
172+
unless: %r{^grep '\^\[\\t \]\*VIRTUAL_ENV=\[\\\\'\\"\]\*/opt/env1\[\\"\\\\'\]\[\\t \]\*\$' /opt/env1/bin/activate$},
173+
)
174+
.that_requires('File[/opt/env1]')
175175
}
176176

177177
it {
178-
expect(subject).to contain_exec('python_virtualenv_/opt/env2').
179-
with(
178+
expect(subject).to contain_exec('python_virtualenv_/opt/env2')
179+
.with(
180180
command: 'python3.8 -m venv --clear /opt/env2 && /opt/env2/bin/pip install --upgrade \'pip <= 20.3.4\' && /opt/env2/bin/pip install --upgrade setuptools',
181181
user: 'root',
182182
creates: '/opt/env2/bin/activate',
183183
path: [
184184
'/bin',
185185
'/usr/bin',
186186
'/usr/sbin',
187-
'/usr/local/bin'
187+
'/usr/local/bin',
188188
],
189189
cwd: '/tmp',
190190
environment: [],
191191
timeout: 600,
192-
unless: %r{^grep '\^\[\\t \]\*VIRTUAL_ENV=\[\\\\'\\"\]\*/opt/env2\[\\"\\\\'\]\[\\t \]\*\$' /opt/env2/bin/activate$}
193-
).
194-
that_requires('File[/opt/env2]')
192+
unless: %r{^grep '\^\[\\t \]\*VIRTUAL_ENV=\[\\\\'\\"\]\*/opt/env2\[\\"\\\\'\]\[\\t \]\*\$' /opt/env2/bin/activate$},
193+
)
194+
.that_requires('File[/opt/env2]')
195195
}
196196

197197
it { is_expected.to contain_file('/opt/env1') }
@@ -384,7 +384,7 @@
384384

385385
it {
386386
expect(subject).to contain_package('pip').with(
387-
'provider' => 'pip'
387+
'provider' => 'pip',
388388
)
389389
}
390390
end

spec/defines/pip_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
operatingsystemrelease: '6',
2222
path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
2323
concat_basedir: '/dne',
24-
pip_version: '18.1'
24+
pip_version: '18.1',
2525
}
2626
end
2727

@@ -195,7 +195,7 @@
195195
operatingsystemrelease: '10.12',
196196
path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
197197
concat_basedir: '/dne',
198-
pip_version: '20.3.4'
198+
pip_version: '20.3.4',
199199
}
200200
end
201201

@@ -221,13 +221,13 @@
221221
kernel: 'Linux',
222222
lsbdistcodename: 'squeeze',
223223
os: {
224-
family: 'Debian'
224+
family: 'Debian',
225225
},
226226
osfamily: 'Debian',
227227
operatingsystem: 'Debian',
228228
operatingsystemrelease: '6',
229229
path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
230-
concat_basedir: '/dne'
230+
concat_basedir: '/dne',
231231
}
232232
end
233233

spec/defines/pyvenv_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
let :facts do
2424
# python3 is required to use pyvenv
2525
facts.merge(
26-
python3_version: '3.5.1'
26+
python3_version: '3.5.1',
2727
)
2828
end
2929

@@ -36,7 +36,7 @@
3636
context 'is absent' do
3737
let :params do
3838
{
39-
ensure: 'absent'
39+
ensure: 'absent',
4040
}
4141
end
4242

@@ -51,7 +51,7 @@
5151
let :facts do
5252
# python 3.6 is required for venv and prompt
5353
facts.merge(
54-
python3_version: '3.6.1'
54+
python3_version: '3.6.1',
5555
)
5656
end
5757
let :title do
@@ -75,7 +75,7 @@
7575
context "prompt on #{os} with python 3.5" do
7676
let :facts do
7777
facts.merge(
78-
python3_version: '3.5.1'
78+
python3_version: '3.5.1',
7979
)
8080
end
8181
let :title do

spec/defines/requirements_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
context 'with /requirements.txt' do
1717
let :params do
1818
{
19-
requirements: '/requirements.txt'
19+
requirements: '/requirements.txt',
2020
}
2121
end
2222

@@ -35,7 +35,7 @@
3535
let :params do
3636
{
3737
owner: 'bob',
38-
group: 'bob'
38+
group: 'bob',
3939
}
4040
end
4141

0 commit comments

Comments
 (0)