[arvados] updated: 2.7.0-5832-g213575b7c5

git repository hosting git at public.arvados.org
Mon Jan 15 22:04:00 UTC 2024


Summary of changes:
 sdk/cli/arvados-cli.gemspec | 7 +++++++
 sdk/ruby/arvados.gemspec    | 7 +++++++
 2 files changed, 14 insertions(+)

       via  213575b7c547cb161525e5e46c85baa01746c748 (commit)
      from  616199aba0034474679b9de9aa31eb61e4afeb6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 213575b7c547cb161525e5e46c85baa01746c748
Author: Brett Smith <brett.smith at curii.com>
Date:   Mon Jan 15 17:02:52 2024 -0500

    20846: Pin faraday-net_http gem version
    
    See comments for rationale.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index 665e8ecf14..27ffb08208 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -43,6 +43,13 @@ Gem::Specification.new do |s|
   # arvados fork of google-api-client gem with old API and new
   # compatibility fixes, built from ../ruby-google-api-client/
   s.add_runtime_dependency('arvados-google-api-client', '>= 0.8.7.5', '< 0.8.9')
+  # arvados-google-api-client depends on faraday-net_http. The latest
+  # versions of it require Ruby 3.0. If you install this gem on Ruby 2.7,
+  # the dependency resolver asks you to resolve the conflict
+  # manually. Instead of teaching all our tooling to do that, we prefer to
+  # require the latest version that supports Ruby 2.7 here. This whole
+  # dependency can be dropped when we drop support for Ruby 2.7.
+  s.add_runtime_dependency('faraday-net_http', '>= 2.0', '<= 3.0.2')
   s.add_runtime_dependency 'activesupport', '>= 3.2.13', '< 8.0'
   s.add_runtime_dependency 'json', '>= 1.7.7', '<3'
   s.add_runtime_dependency 'optimist', '~> 3.0'
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index 711b51daaf..3e5ec5963b 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -43,6 +43,13 @@ Gem::Specification.new do |s|
   # arvados fork of google-api-client gem with old API and new
   # compatibility fixes, built from ../ruby-google-api-client/
   s.add_dependency('arvados-google-api-client', '>= 0.8.7.5', '< 0.8.8')
+  # arvados-google-api-client depends on faraday-net_http. The latest
+  # versions of it require Ruby 3.0. If you install this gem on Ruby 2.7,
+  # the dependency resolver asks you to resolve the conflict
+  # manually. Instead of teaching all our tooling to do that, we prefer to
+  # require the latest version that supports Ruby 2.7 here. This whole
+  # dependency can be dropped when we drop support for Ruby 2.7.
+  s.add_dependency('faraday-net_http', '>= 2.0', '<= 3.0.2')
   # work around undeclared dependency on i18n in some activesupport 3.x.x:
   s.add_dependency('i18n')
   s.add_dependency('json', '>= 1.7.7', '<3')

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list