Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweaks to get travis ci tests working again #315

Merged
merged 4 commits into from
Jul 15, 2016
Merged

Tweaks to get travis ci tests working again #315

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21b3b78
Remove whitespace that makes lint complain
mbmilligan Jul 15, 2016
285069d
disable 140 character test
mbmilligan Jul 15, 2016
90f800f
Pin older json gem for ruby 1.8.7
mbmilligan Jul 15, 2016
315efa0
pin json gem to 1.0 for ruby < 2.0
mbmilligan Jul 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ end
if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
gem 'rspec', '~> 2.0'
gem 'rake', '~> 10.0'
gem 'json', '~> 1.8'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

json needs to be pinned to v1 for ruby < 2

Please use this instead

if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0'
  gem 'json', '~> 1.0'
end

else
gem 'rake', :require => false
end
Expand Down
3 changes: 2 additions & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ end
PuppetLint.configuration.fail_on_warnings
PuppetLint.configuration.send('relative')
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_140chars')
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
PuppetLint.configuration.send('disable_class_parameter_defaults')
PuppetLint.configuration.send('disable_documentation')
Expand All @@ -36,4 +37,4 @@ task :test => [
:syntax,
:lint,
:spec,
]
]
4 changes: 2 additions & 2 deletions manifests/pip.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@

$python_provider = getparam(Class['python'], 'provider')
$python_version = getparam(Class['python'], 'version')

# Get SCL exec prefix
# NB: this will not work if you are running puppet from scl enabled shell
$exec_prefix = $python_provider ? {
'scl' => "scl enable ${python_version} -- ",
'rhscl' => "scl enable ${python_version} -- ",
default => '',
}

# Parameter validation
if ! $virtualenv {
fail('python::pip: virtualenv parameter must not be empty')
Expand Down