From f6b70ce3f81f39c18d985e7067ee500b2e926a55 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Wed, 1 Apr 2020 15:22:31 +0200 Subject: [PATCH] Pin pry to 0.12.2 when beaker-rspec is 3.6.3 See comment in patch for details. Only required to fix Ubuntu that has a newer version of beaker-rspec. See failure in [1]. Logs at [2]. [1] https://review.opendev.org/#/c/716197/ [2] https://storage.bhs.cloud.ovh.net/v1/AUTH_dcaab5e32b234d56b626f72581e3644c/zuul_opendev_logs_f91/716506/1/check/puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic/f911bb5/job-output.txt Change-Id: If9a03f49222e1a2dc16ade255fc79b69b85ab2de --- puppet-openstack_spec_helper.gemspec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/puppet-openstack_spec_helper.gemspec b/puppet-openstack_spec_helper.gemspec index 07a2cdf..95be945 100644 --- a/puppet-openstack_spec_helper.gemspec +++ b/puppet-openstack_spec_helper.gemspec @@ -89,6 +89,16 @@ Gem::Specification.new do |spec| # 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 + + # NOTE(tobias-urdin): When beaker_rspec_version is = 6.2.3 it depends on + # beaker ~> 3.0 which resolves to 3.37.0 which depends on pry-byebug ~> 3.4.2 + # resolving to 3.4.3 that depends on pry ~> 0.13.0 which it doesn't support + # so we should cap pry to 0.12.2 otherwise if beaker-rspec is 5.6.0 we + # pin to 0.10.4 + # TODO(tobias-urdin): Evaulate/remove when we unpin beaker-rspec or beaker. + pry_version = beaker_rspec_version == '= 6.2.3' ? '= 0.12.2' : '= 0.10.4' + spec.add_dependency 'pry', pry_version + # Pin beaker-puppet to 0.17.1 because 1.0.0 does not work with our older # beaker and beaker-puppet requirements. spec.add_dependency 'beaker-puppet', ['= 0.17.1']