From f361c2439d0b2a9b8ac839b62a868884261e7897 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 22 Aug 2023 11:26:22 -0400 Subject: [PATCH] 20862: Update components to latest arvados, google-api-client gems. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- apps/workbench/Gemfile | 2 +- apps/workbench/Gemfile.lock | 44 +++++++------------ sdk/cli/arvados-cli.gemspec | 2 +- services/api/Gemfile | 2 +- services/api/Gemfile.lock | 44 +++++++------------ .../login-sync/arvados-login-sync.gemspec | 2 +- 6 files changed, 34 insertions(+), 62 deletions(-) diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile index 8b40db355b..cc2cb4140c 100644 --- a/apps/workbench/Gemfile +++ b/apps/workbench/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' gem 'rails', '~> 5.2.0' -gem 'arvados', '~> 2.7.0.dev20230818173219' +gem 'arvados', '~> 2.7.0.dev20230822151629' gem 'activerecord-nulldb-adapter', git: 'https://github.com/arvados/nulldb' gem 'multi_json' diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index 89ba900c53..e08cfac6a8 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -62,12 +62,10 @@ GEM andand (1.3.3) angularjs-rails (1.3.15) arel (9.0.0) - arvados (2.7.0.dev20230818173219) + arvados (2.7.0.dev20230822151629) activesupport (>= 3) andand (~> 1.3, >= 1.3.3) - arvados-google-api-client (>= 0.8.7.5, < 0.8.8) - faraday (~> 1.0) - faraday-multipart (~> 1.0) + arvados-google-api-client (= 0.8.7.5, < 0.8.8) i18n (~> 0) json (>= 1.7.7, < 3) jwt (>= 0.1.5, < 2) @@ -76,13 +74,14 @@ GEM addressable (~> 2.3) autoparse (~> 0.3) extlib (~> 0.9) - faraday (~> 1.0) + faraday (~> 2.0) + faraday-gzip (~> 2.0) faraday-multipart (~> 1.0) googleauth (~> 1.0) launchy (~> 2.4) multi_json (~> 1.10) retriable (~> 1.4) - signet (~> 0.6) + signet (~> 0.16.0) autoparse (0.3.3) addressable (>= 2.3.1) extlib (>= 0.9.15) @@ -120,29 +119,15 @@ GEM erubi (1.12.0) execjs (2.7.0) extlib (0.9.16) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday (2.7.10) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) + faraday-gzip (2.0.0) + faraday (>= 1.0) + zlib (~> 3.0) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-net_http (3.0.2) ffi (1.10.0) flamegraph (0.9.5) globalid (1.1.0) @@ -292,9 +277,9 @@ GEM selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) - signet (0.17.0) + signet (0.16.1) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simplecov (0.16.1) @@ -325,6 +310,7 @@ GEM websocket-extensions (0.1.5) xpath (2.1.0) nokogiri (~> 1.3) + zlib (3.0.0) PLATFORMS ruby @@ -334,7 +320,7 @@ DEPENDENCIES activerecord-nulldb-adapter! andand angularjs-rails (~> 1.3.8) - arvados (~> 2.7.0.dev20230818173219) + arvados (~> 2.7.0.dev20230822151629) bootstrap-sass (~> 3.4.1) bootstrap-tab-history-rails bootstrap-x-editable-rails diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec index 07669244c5..01cf416287 100644 --- a/sdk/cli/arvados-cli.gemspec +++ b/sdk/cli/arvados-cli.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |s| s.executables << "arv" s.executables << "arv-tag" s.required_ruby_version = '>= 2.5.0' - s.add_runtime_dependency 'arvados', '>= 2.7.0.dev20230818173219' + s.add_runtime_dependency 'arvados', '>= 2.7.0.dev20230822151629' # Our google-api-client dependency used to be < 0.9, but that could be # satisfied by the buggy 0.9.pre*, cf. https://dev.arvados.org/issues/9213 # We need at least version 0.8.7.5 for compatibility with faraday >= 1.0. diff --git a/services/api/Gemfile b/services/api/Gemfile index 5cd44c007d..01236ff8aa 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -49,7 +49,7 @@ gem 'optimist' gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails' -gem 'arvados', '~> 2.7.0.dev20230818173219' +gem 'arvados', '~> 2.7.0.dev20230822151629' gem 'httpclient' gem 'safe_yaml' diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 7141c68055..2ec546fed8 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -57,12 +57,10 @@ GEM public_suffix (>= 2.0.2, < 6.0) andand (1.3.3) arel (9.0.0) - arvados (2.7.0.dev20230818173219) + arvados (2.7.0.dev20230822151629) activesupport (>= 3) andand (~> 1.3, >= 1.3.3) - arvados-google-api-client (>= 0.8.7.5, < 0.8.8) - faraday (~> 1.0) - faraday-multipart (~> 1.0) + arvados-google-api-client (= 0.8.7.5, < 0.8.8) i18n (~> 0) json (>= 1.7.7, < 3) jwt (>= 0.1.5, < 2) @@ -71,13 +69,14 @@ GEM addressable (~> 2.3) autoparse (~> 0.3) extlib (~> 0.9) - faraday (~> 1.0) + faraday (~> 2.0) + faraday-gzip (~> 2.0) faraday-multipart (~> 1.0) googleauth (~> 1.0) launchy (~> 2.4) multi_json (~> 1.10) retriable (~> 1.4) - signet (~> 0.6) + signet (~> 0.16.0) autoparse (0.3.3) addressable (>= 2.3.1) extlib (>= 0.9.15) @@ -93,29 +92,15 @@ GEM factory_bot_rails (5.0.1) factory_bot (~> 5.0.0) railties (>= 4.2.0) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday (2.7.10) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) + faraday-gzip (2.0.0) + faraday (>= 1.0) + zlib (~> 3.0) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-net_http (3.0.2) ffi (1.9.25) globalid (1.1.0) activesupport (>= 5.0) @@ -223,9 +208,9 @@ GEM ruby-prof (0.15.9) ruby2_keywords (0.0.5) safe_yaml (1.0.5) - signet (0.17.0) + signet (0.16.1) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simplecov (0.7.1) @@ -250,6 +235,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) + zlib (3.0.0) PLATFORMS ruby @@ -257,7 +243,7 @@ PLATFORMS DEPENDENCIES acts_as_api andand - arvados (~> 2.7.0.dev20230818173219) + arvados (~> 2.7.0.dev20230822151629) byebug factory_bot_rails httpclient diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec index 3b1b14adcd..9cd19bb125 100644 --- a/services/login-sync/arvados-login-sync.gemspec +++ b/services/login-sync/arvados-login-sync.gemspec @@ -41,7 +41,7 @@ Gem::Specification.new do |s| # bundler's dependency resolver to include 'pre-release' versions, like the # ones we build (but not publish) on every test pipeline job. # See: https://github.com/rubygems/bundler/issues/4340 - s.add_runtime_dependency 'arvados', '~> 2.7.0.dev20230818173219' + s.add_runtime_dependency 'arvados', '~> 2.7.0.dev20230822151629' s.add_runtime_dependency 'launchy', '< 2.5' # 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') -- 2.30.2