From 63c6babe357292a234d6982bfcd67171b8259ec2 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Mon, 4 Oct 2021 21:28:53 -0400 Subject: [PATCH] 18247: fix arvados gem dependency on the faraday gem Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- sdk/cli/arvados-cli.gemspec | 7 +++---- sdk/ruby/arvados.gemspec | 9 +++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec index 08fcfe3a34..1ff841acdd 100644 --- a/sdk/cli/arvados-cli.gemspec +++ b/sdk/cli/arvados-cli.gemspec @@ -41,8 +41,9 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.1.0' s.add_runtime_dependency 'arvados', '>= 1.4.1.20190320201707' # Our google-api-client dependency used to be < 0.9, but that could be - # satisfied by the buggy 0.9.pre*. https://dev.arvados.org/issues/9213 - s.add_runtime_dependency 'arvados-google-api-client', '~> 0.6', '>= 0.6.3', '<0.8.9' + # satisfied by the buggy 0.9.pre*, cf. https://dev.arvados.org/issues/9213 + # We need at least version 0.8.7.3, cf. https://dev.arvados.org/issues/15673 + s.add_runtime_dependency('arvados-google-api-client', '>= 0.8.7.3', '< 0.8.9') s.add_runtime_dependency 'activesupport', '>= 3.2.13', '< 5.3' s.add_runtime_dependency 'json', '>= 1.7.7', '<3' s.add_runtime_dependency 'optimist', '~> 3.0' @@ -51,8 +52,6 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'oj', '< 3.10.9' s.add_runtime_dependency 'curb', '~> 0.8' s.add_runtime_dependency 'launchy', '< 2.5' - # arvados-google-api-client 0.8.7.2 is incompatible with faraday 0.16.2 - s.add_dependency('faraday', '< 0.16') s.homepage = 'https://arvados.org' end diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec index 7cc2fd931c..b196a1c33e 100644 --- a/sdk/ruby/arvados.gemspec +++ b/sdk/ruby/arvados.gemspec @@ -41,13 +41,14 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', '>= 3') s.add_dependency('andand', '~> 1.3', '>= 1.3.3') # Our google-api-client dependency used to be < 0.9, but that could be - # satisfied by the buggy 0.9.pre*. https://dev.arvados.org/issues/9213 - s.add_dependency('arvados-google-api-client', '>= 0.7', '< 0.8.9') + # satisfied by the buggy 0.9.pre*, cf. https://dev.arvados.org/issues/9213 + # We need at least version 0.8.7.3, cf. https://dev.arvados.org/issues/15673 + s.add_dependency('arvados-google-api-client', '>= 0.8.7.3', '< 0.8.9') # work around undeclared dependency on i18n in some activesupport 3.x.x: s.add_dependency('i18n', '~> 0') s.add_dependency('json', '>= 1.7.7', '<3') - # arvados-google-api-client 0.8.7.2 is incompatible with faraday 0.16.2 - s.add_dependency('faraday', '< 0.16') + # Avoid warning on Ruby 2.7, cf. https://dev.arvados.org/issues/18247 + s.add_dependency('faraday', '>= 0.17.4') s.add_runtime_dependency('jwt', '<2', '>= 0.1.5') s.homepage = 'https://arvados.org' -- 2.30.2