From f646ae987b5c7f476ff5384249e189628b1c0443 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Thu, 10 Oct 2019 14:09:50 +0200 Subject: [PATCH] Fix signet pin Missing a .0 in the semver so ~> would parse 0.11 like 11 could be increased. Also move it above to be cleaner. Change-Id: I8b14c726305edf24d117f85d357e4b8f4945ec9f --- puppet-openstack_spec_helper.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/puppet-openstack_spec_helper.gemspec b/puppet-openstack_spec_helper.gemspec index 4c602ac..8bb9094 100644 --- a/puppet-openstack_spec_helper.gemspec +++ b/puppet-openstack_spec_helper.gemspec @@ -66,6 +66,10 @@ Gem::Specification.new do |spec| # fog-core 1.44.0 requires xmlrpc 0.3.0 which requires ruby 2.3.0 which is not available on centos7 spec.add_dependency 'fog-core', ['!= 1.44.0'] + # NOTE(tobias-urdin): Pin signet to 0.11.0 as 0.12.0 requires ruby >= 2.4.0 + signet_version = RUBY_VERSION < '2.4.0' ? '~> 0.11.0' : '>= 0.11.0' + spec.add_dependency 'signet', signet_version + # dependencies that are needed to run beaker-rspec beaker_rspec_version = RUBY_VERSION < '2.1.8' ? '= 5.6.0' : '= 6.2.3' spec.add_dependency 'beaker-rspec', beaker_rspec_version @@ -75,10 +79,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'beaker-puppet_install_helper' spec.add_dependency 'vagrant-wrapper' - # NOTE(tobias-urdin): Pin signet to 0.11.0 as 0.12.0 requires ruby >= 2.4.0 - signet_version = RUBY_VERSION < '2.4.0' ? '~> 0.11' : '>= 0.11.0' - spec.add_dependency 'signet', signet_version - # NOTE(tobias-urdin): Pin r10k and cri gems since r10k 3.0.0 # requires a cri version that must have ruby >= 2.3.0 spec.add_dependency 'r10k', ['~> 2.6']