From 210f1cf691bca437705c8e79ed8a77353c0abd8f Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 1 Jun 2021 15:00:15 -0400 Subject: [PATCH] 17738: Make our arvados-api and arvados-workbench Gemfiles use the arvados 2.1.4 gem. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- apps/workbench/Gemfile | 2 +- apps/workbench/Gemfile.lock | 28 +++++++++++----------------- services/api/Gemfile | 4 ++-- services/api/Gemfile.lock | 36 +++++++++++++++--------------------- 4 files changed, 29 insertions(+), 41 deletions(-) diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile index d5b416b539..9f7008ba05 100644 --- a/apps/workbench/Gemfile +++ b/apps/workbench/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' gem 'rails', '~> 5.2.0' -gem 'arvados', git: 'https://github.com/arvados/arvados.git', glob: 'sdk/ruby/arvados.gemspec' +gem 'arvados', '~> 2.1.4' 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 0f29c543b4..a23eeaed4d 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -1,17 +1,3 @@ -GIT - remote: https://github.com/arvados/arvados.git - revision: c210114aa8c77ba0bb8e4d487fc1507b40f9560f - glob: sdk/ruby/arvados.gemspec - specs: - arvados (1.5.0.pre20200114202620) - activesupport (>= 3) - andand (~> 1.3, >= 1.3.3) - arvados-google-api-client (>= 0.7, < 0.8.9) - faraday (< 0.16) - i18n (~> 0) - json (>= 1.7.7, < 3) - jwt (>= 0.1.5, < 2) - GIT remote: https://github.com/arvados/nulldb revision: d8e0073b665acdd2537c5eb15178a60f02f4b413 @@ -76,6 +62,14 @@ GEM andand (1.3.3) angularjs-rails (1.3.15) arel (9.0.0) + arvados (2.1.4) + activesupport (>= 3) + andand (~> 1.3, >= 1.3.3) + arvados-google-api-client (>= 0.7, < 0.8.9) + faraday (< 0.16) + i18n (~> 0) + json (>= 1.7.7, < 3) + jwt (>= 0.1.5, < 2) arvados-google-api-client (0.8.7.4) activesupport (>= 3.2, < 5.3) addressable (~> 2.3) @@ -156,7 +150,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.3.0) + json (2.5.1) jwt (1.5.6) launchy (2.4.3) addressable (~> 2.3) @@ -225,7 +219,7 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - public_suffix (4.0.5) + public_suffix (4.0.6) racc (1.5.2) rack (2.2.3) rack-mini-profiler (1.0.2) @@ -341,7 +335,7 @@ DEPENDENCIES activerecord-nulldb-adapter! andand angularjs-rails (~> 1.3.8) - arvados! + arvados (~> 2.1.4) bootsnap bootstrap-sass (~> 3.4.1) bootstrap-tab-history-rails diff --git a/services/api/Gemfile b/services/api/Gemfile index 1e12d6a4ce..88d078906d 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -57,8 +57,8 @@ gem 'optimist' gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails' -# Import arvados gem. Note: actual git commit is pinned via Gemfile.lock -gem 'arvados', git: 'https://github.com/arvados/arvados.git', glob: 'sdk/ruby/arvados.gemspec' +# Import arvados gem. +gem 'arvados', '~> 2.1.4' gem 'httpclient' gem 'sshkey' diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 58504d057a..82fd84fe2d 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -1,17 +1,3 @@ -GIT - remote: https://github.com/arvados/arvados.git - revision: 81725af5d5d2e6cd18ba7099ba5fb1fc520f4f8c - glob: sdk/ruby/arvados.gemspec - specs: - arvados (1.5.0.pre20200114202620) - activesupport (>= 3) - andand (~> 1.3, >= 1.3.3) - arvados-google-api-client (>= 0.7, < 0.8.9) - faraday (< 0.16) - i18n (~> 0) - json (>= 1.7.7, < 3) - jwt (>= 0.1.5, < 2) - GIT remote: https://github.com/arvados/themes_for_rails revision: ddf6e592b3b6493ea0c2de7b5d3faa120ed35be0 @@ -71,6 +57,14 @@ GEM public_suffix (>= 2.0.2, < 5.0) andand (1.3.3) arel (9.0.0) + arvados (2.1.4) + activesupport (>= 3) + andand (~> 1.3, >= 1.3.3) + arvados-google-api-client (>= 0.7, < 0.8.9) + faraday (< 0.16) + i18n (~> 0) + json (>= 1.7.7, < 3) + jwt (>= 0.1.5, < 2) arvados-google-api-client (0.8.7.4) activesupport (>= 3.2, < 5.3) addressable (~> 2.3) @@ -127,10 +121,10 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.3.0) + json (2.5.1) jwt (1.5.6) - launchy (2.4.3) - addressable (~> 2.3) + launchy (2.5.0) + addressable (~> 2.7) libv8 (3.16.14.19) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -159,7 +153,7 @@ GEM mocha (1.8.0) metaclass (~> 0.0.1) msgpack (1.3.3) - multi_json (1.14.1) + multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) net-scp (2.0.0) @@ -187,13 +181,13 @@ GEM oauth2 (~> 1.1) omniauth (~> 1.2) optimist (3.0.0) - os (1.0.1) + os (1.1.1) passenger (6.0.2) rack rake (>= 0.8.1) pg (1.1.4) power_assert (1.1.4) - public_suffix (4.0.3) + public_suffix (4.0.6) racc (1.5.2) rack (2.2.3) rack-test (1.1.0) @@ -297,7 +291,7 @@ PLATFORMS DEPENDENCIES acts_as_api andand - arvados! + arvados (~> 2.1.4) bootsnap byebug factory_bot_rails -- 2.30.2