[arvados] updated: 2.6.0-1198-g9a930f08a3
git repository hosting
git at public.arvados.org
Tue Aug 29 18:56:17 UTC 2023
Summary of changes:
apps/workbench/Gemfile | 2 +-
apps/workbench/Gemfile.lock | 8 ++++----
sdk/cli/arvados-cli.gemspec | 2 +-
sdk/ruby/arvados.gemspec | 2 +-
services/api/Gemfile | 2 +-
services/api/Gemfile.lock | 8 ++++----
services/login-sync/arvados-login-sync.gemspec | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
via 9a930f08a3b78221cea9cd90a8e8c9a77e3eb068 (commit)
via be61dec610e6cfd400c3e616eb3a30a062e25116 (commit)
from 7415e01eb23989648fb4850b5a0569796973445f (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 9a930f08a3b78221cea9cd90a8e8c9a77e3eb068
Author: Tom Clegg <tom at curii.com>
Date: Tue Aug 29 14:55:44 2023 -0400
20862: Update gemfiles to use arvados-2.7.0.rc1.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index cda942d5d5..5c69fc9f32 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.dev20230824142549'
+gem 'arvados', '~> 2.7.0.rc1'
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 c730d2029a..8e0f63d777 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -62,11 +62,11 @@ GEM
andand (1.3.3)
angularjs-rails (1.3.15)
arel (9.0.0)
- arvados (2.7.0.dev20230824142549)
+ arvados (2.7.0.rc1)
activesupport (>= 3)
andand (~> 1.3, >= 1.3.3)
arvados-google-api-client (>= 0.8.7.5, < 0.8.8)
- i18n (~> 0)
+ i18n
json (>= 1.7.7, < 3)
jwt (>= 0.1.5, < 2)
arvados-google-api-client (0.8.7.5)
@@ -142,7 +142,7 @@ GEM
headless (1.0.2)
highline (2.0.2)
httpclient (2.8.3)
- i18n (0.9.5)
+ i18n (1.14.1)
concurrent-ruby (~> 1.0)
jquery-rails (4.5.1)
rails-dom-testing (>= 1, < 3)
@@ -320,7 +320,7 @@ DEPENDENCIES
activerecord-nulldb-adapter!
andand
angularjs-rails (~> 1.3.8)
- arvados (~> 2.7.0.dev20230824142549)
+ arvados (~> 2.7.0.rc1)
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 01cf416287..68a59f76c7 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.dev20230822151629'
+ s.add_runtime_dependency 'arvados', '~> 2.7.0.rc1'
# 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 c4596cbe03..b1f6485436 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.dev20230824142549'
+gem 'arvados', '~> 2.7.0.rc1'
gem 'httpclient'
gem 'safe_yaml'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 9d963120e2..923541259d 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -57,11 +57,11 @@ GEM
public_suffix (>= 2.0.2, < 6.0)
andand (1.3.3)
arel (9.0.0)
- arvados (2.7.0.dev20230824142549)
+ arvados (2.7.0.rc1)
activesupport (>= 3)
andand (~> 1.3, >= 1.3.3)
arvados-google-api-client (>= 0.8.7.5, < 0.8.8)
- i18n (~> 0)
+ i18n
json (>= 1.7.7, < 3)
jwt (>= 0.1.5, < 2)
arvados-google-api-client (0.8.7.5)
@@ -112,7 +112,7 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
httpclient (2.8.3)
- i18n (0.9.5)
+ i18n (1.14.1)
concurrent-ruby (~> 1.0)
jquery-rails (4.5.1)
rails-dom-testing (>= 1, < 3)
@@ -243,7 +243,7 @@ PLATFORMS
DEPENDENCIES
acts_as_api
andand
- arvados (~> 2.7.0.dev20230824142549)
+ arvados (~> 2.7.0.rc1)
byebug
factory_bot_rails
httpclient
diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec
index d0ad308e54..ce16283c3f 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.dev20230824142549'
+ s.add_runtime_dependency 'arvados', '~> 2.7.0.rc1'
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')
commit be61dec610e6cfd400c3e616eb3a30a062e25116
Author: Tom Clegg <tom at curii.com>
Date: Tue Aug 29 14:50:43 2023 -0400
20862: Fix i18n dependency to not conflict with Rails 6.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index e8dd19b97d..6446cd9269 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
# We need at least version 0.8.7.5 for compatibility with faraday >= 1.0.
s.add_dependency('arvados-google-api-client', '>= 0.8.7.5', '< 0.8.8')
# work around undeclared dependency on i18n in some activesupport 3.x.x:
- s.add_dependency('i18n', '~> 0')
+ s.add_dependency('i18n')
s.add_dependency('json', '>= 1.7.7', '<3')
s.add_runtime_dependency('jwt', '<2', '>= 0.1.5')
s.homepage =
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list