Skip to content

Commit 93f9ecf

Browse files
ghoneycuttChristian Garling
ghoneycutt
authored and
Christian Garling
committed
Support latest Puppet v3 and last five releases of Puppet v4
Use actual versions of ruby that are supported, so 2.1.9 instead of 2.1.0 and remove 2.3.1 as it never made it into Puppet v4.
1 parent c7cf560 commit 93f9ecf

3 files changed

Lines changed: 31 additions & 83 deletions

File tree

‎.travis.yml‎

Lines changed: 16 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -11,90 +11,33 @@ before_install:
1111
- gem --version
1212
- bundle -v
1313

14-
rvm:
15-
- 1.8.7
16-
- 1.9.3
17-
- 2.0.0
18-
- 2.1.0
19-
- 2.3.1
20-
21-
env:
22-
matrix:
23-
- PUPPET_GEM_VERSION="~> 3.1.0"
24-
- PUPPET_GEM_VERSION="~> 3.2.0"
25-
- PUPPET_GEM_VERSION="~> 3.3.0"
26-
- PUPPET_GEM_VERSION="~> 3.4.0"
27-
- PUPPET_GEM_VERSION="~> 3.5.0"
28-
- PUPPET_GEM_VERSION="~> 3.6.0"
29-
- PUPPET_GEM_VERSION="~> 3.7.0"
30-
- PUPPET_GEM_VERSION="~> 3.8.0"
31-
- PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
32-
- PUPPET_GEM_VERSION="~> 4.0.0"
33-
- PUPPET_GEM_VERSION="~> 4.1.0"
34-
- PUPPET_GEM_VERSION="~> 4.2.0"
35-
- PUPPET_GEM_VERSION="~> 4.3.0"
36-
- PUPPET_GEM_VERSION="~> 4.4.0"
37-
- PUPPET_GEM_VERSION="~> 4.5.0"
38-
- PUPPET_GEM_VERSION="~> 4.6.0"
39-
- PUPPET_GEM_VERSION="~> 4.7.0"
40-
- PUPPET_GEM_VERSION="~> 4.8.0"
41-
- PUPPET_GEM_VERSION="~> 4"
42-
4314
sudo: false
4415

4516
script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec'
4617

4718
matrix:
4819
fast_finish: true
49-
exclude:
50-
- rvm: 2.0.0
51-
env: PUPPET_GEM_VERSION="~> 3.1.0"
52-
- rvm: 2.1.0
53-
env: PUPPET_GEM_VERSION="~> 3.1.0"
54-
- rvm: 2.1.0
55-
env: PUPPET_GEM_VERSION="~> 3.2.0"
56-
- rvm: 2.1.0
57-
env: PUPPET_GEM_VERSION="~> 3.3.0"
58-
- rvm: 2.1.0
59-
env: PUPPET_GEM_VERSION="~> 3.4.0"
60-
- rvm: 1.8.7
61-
env: PUPPET_GEM_VERSION="~> 4.0.0"
62-
- rvm: 1.8.7
63-
env: PUPPET_GEM_VERSION="~> 4.1.0"
64-
- rvm: 1.8.7
65-
env: PUPPET_GEM_VERSION="~> 4.2.0"
66-
- rvm: 1.8.7
67-
env: PUPPET_GEM_VERSION="~> 4.3.0"
68-
- rvm: 1.8.7
69-
env: PUPPET_GEM_VERSION="~> 4.4.0"
70-
- rvm: 1.8.7
71-
env: PUPPET_GEM_VERSION="~> 4.5.0"
20+
include:
7221
- rvm: 1.8.7
22+
env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
23+
- rvm: 1.9.3
24+
env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
25+
- rvm: 2.0.0
26+
env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
27+
- rvm: 2.1.9
28+
env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
29+
- rvm: 2.1.9
7330
env: PUPPET_GEM_VERSION="~> 4.6.0"
74-
- rvm: 1.8.7
31+
- rvm: 2.1.9
7532
env: PUPPET_GEM_VERSION="~> 4.7.0"
76-
- rvm: 1.8.7
33+
- rvm: 2.1.9
7734
env: PUPPET_GEM_VERSION="~> 4.8.0"
78-
- rvm: 1.8.7
35+
- rvm: 2.1.9
36+
env: PUPPET_GEM_VERSION="~> 4.9.0"
37+
- rvm: 2.1.9
38+
env: PUPPET_GEM_VERSION="~> 4.10.0"
39+
- rvm: 2.1.9
7940
env: PUPPET_GEM_VERSION="~> 4"
80-
- rvm: 2.3.1
81-
env: PUPPET_GEM_VERSION="~> 3.1.0"
82-
- rvm: 2.3.1
83-
env: PUPPET_GEM_VERSION="~> 3.2.0"
84-
- rvm: 2.3.1
85-
env: PUPPET_GEM_VERSION="~> 3.3.0"
86-
- rvm: 2.3.1
87-
env: PUPPET_GEM_VERSION="~> 3.4.0"
88-
- rvm: 2.3.1
89-
env: PUPPET_GEM_VERSION="~> 3.5.0"
90-
- rvm: 2.3.1
91-
env: PUPPET_GEM_VERSION="~> 3.6.0"
92-
- rvm: 2.3.1
93-
env: PUPPET_GEM_VERSION="~> 3.7.0"
94-
- rvm: 2.3.1
95-
env: PUPPET_GEM_VERSION="~> 3.8.0"
96-
- rvm: 2.3.1
97-
env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
9841

9942
notifications:
10043
email: false

‎Gemfile‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,20 @@ else
1818
gem 'facter', :require => false
1919
end
2020

21-
gem 'puppetlabs_spec_helper', '>= 1.2.0', :require => false
22-
gem 'rspec-puppet', :require => false
21+
gem 'rspec-puppet', '~> 2.0', :require => false
2322
gem 'puppet-lint', '~> 2.0', :require => false
2423
gem 'simplecov', :require => false
2524

2625
gem 'rspec', '~> 2.0', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
2726
gem 'rake', '~> 10.0', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
2827
gem 'json', '<= 1.8', :require => false if RUBY_VERSION < '2.0.0'
2928
gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0'
30-
gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9'
31-
gem 'metadata-json-lint', :require => false if RUBY_VERSION >= '1.9'
29+
gem 'metadata-json-lint', '0.0.11' if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
30+
gem 'metadata-json-lint', '1.0.0' if RUBY_VERSION >= '1.9' && RUBY_VERSION < '2.0'
31+
gem 'metadata-json-lint' if RUBY_VERSION >= '2.0'
32+
33+
gem 'puppetlabs_spec_helper', '2.0.2', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
34+
gem 'puppetlabs_spec_helper', '>= 2.0.0', :require => false if RUBY_VERSION >= '1.9'
35+
gem 'parallel_tests', '<= 2.9.0', :require => false if RUBY_VERSION < '2.0.0'
3236

3337
# vim:ft=ruby

‎README.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ Puppet module for installing and managing python, pip, virtualenvs and Gunicorn
66

77
# Compatibility #
88

9-
* Puppet v3 (with and without the future parser)
9+
See `.travis.yml` for compatibility matrix.
10+
11+
* Puppet v3 (with the future parser)
1012
* Puppet v4
1113

1214
## Ruby versions
1315

14-
* 1.8.7
15-
* 1.9.3
16-
* 2.0.0
17-
* 2.1.0
18-
* 2.3.1
16+
* 1.8.7 - Puppet 3
17+
* 1.9.3 - Puppet 3
18+
* 2.0.0 - Puppet 3
19+
* 2.1.9 - Puppet 3 & 4
1920

2021
## OS Distributions ##
2122

0 commit comments

Comments
 (0)