[arvados] created: 2.6.0-522-g6e91ab41f
git repository hosting
git at public.arvados.org
Fri Aug 18 20:41:57 UTC 2023
at 6e91ab41ffa1509dd1d4e2b8ecb559dd429c6ea4 (commit)
commit 6e91ab41ffa1509dd1d4e2b8ecb559dd429c6ea4
Author: Tom Clegg <tom at curii.com>
Date: Fri Aug 18 16:09:07 2023 -0400
20862: Update apps to latest ruby SDK.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 00dbad086..8b40db355 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.1.5'
+gem 'arvados', '~> 2.7.0.dev20230818173219'
gem 'activerecord-nulldb-adapter', git: 'https://github.com/arvados/nulldb'
gem 'multi_json'
@@ -104,7 +104,3 @@ gem 'logstash-event'
gem 'safe_yaml'
gem 'npm-rails'
-
-# arvados-google-api-client and googleauth (and thus arvados) gems
-# depend on signet, but signet 0.12 is incompatible with ruby 2.3.
-gem 'signet', '< 0.12'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 55f4a881c..89ba900c5 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -57,26 +57,28 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.5)
+ public_suffix (>= 2.0.2, < 6.0)
andand (1.3.3)
angularjs-rails (1.3.15)
arel (9.0.0)
- arvados (2.1.5)
+ arvados (2.7.0.dev20230818173219)
activesupport (>= 3)
andand (~> 1.3, >= 1.3.3)
- arvados-google-api-client (>= 0.7, < 0.8.9)
- faraday (< 0.16)
+ arvados-google-api-client (>= 0.8.7.5, < 0.8.8)
+ faraday (~> 1.0)
+ faraday-multipart (~> 1.0)
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)
+ arvados-google-api-client (0.8.7.5)
+ activesupport (>= 3.2, < 8.0)
addressable (~> 2.3)
autoparse (~> 0.3)
extlib (~> 0.9)
- faraday (~> 0.9)
- googleauth (~> 0.3)
+ faraday (~> 1.0)
+ faraday-multipart (~> 1.0)
+ googleauth (~> 1.0)
launchy (~> 2.4)
multi_json (~> 1.10)
retriable (~> 1.4)
@@ -118,19 +120,40 @@ GEM
erubi (1.12.0)
execjs (2.7.0)
extlib (0.9.16)
- faraday (0.15.4)
- multipart-post (>= 1.2, < 3)
+ 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)
+ 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-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)
ffi (1.10.0)
flamegraph (0.9.5)
globalid (1.1.0)
activesupport (>= 5.0)
- googleauth (0.9.0)
- faraday (~> 0.12)
+ googleauth (1.7.0)
+ faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
- signet (~> 0.7)
+ signet (>= 0.16, < 2.a)
headless (1.0.2)
highline (2.0.2)
httpclient (2.8.3)
@@ -140,7 +163,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- json (2.5.1)
+ json (2.6.3)
jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
@@ -170,7 +193,7 @@ GEM
morrisjs-rails (0.5.1.2)
railties (> 3.1, < 6)
multi_json (1.15.0)
- multipart-post (2.1.1)
+ multipart-post (2.3.0)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-sftp (2.1.2)
@@ -185,7 +208,7 @@ GEM
npm-rails (0.2.1)
rails (>= 3.2)
oj (3.7.12)
- os (1.1.1)
+ os (1.1.4)
passenger (6.0.15)
rack
rake (>= 0.8.1)
@@ -198,7 +221,7 @@ GEM
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
- public_suffix (4.0.6)
+ public_suffix (5.0.3)
racc (1.6.2)
rack (2.2.7)
rack-mini-profiler (1.0.2)
@@ -247,6 +270,7 @@ GEM
retriable (1.4.1)
ruby-debug-passenger (0.2.0)
ruby-prof (0.17.0)
+ ruby2_keywords (0.0.5)
rubyzip (1.3.0)
rvm-capistrano (1.5.6)
capistrano (~> 2.15.4)
@@ -268,9 +292,9 @@ GEM
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
- signet (0.11.0)
- addressable (~> 2.3)
- faraday (~> 0.9)
+ signet (0.17.0)
+ addressable (~> 2.8)
+ faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simplecov (0.16.1)
@@ -310,7 +334,7 @@ DEPENDENCIES
activerecord-nulldb-adapter!
andand
angularjs-rails (~> 1.3.8)
- arvados (~> 2.1.5)
+ arvados (~> 2.7.0.dev20230818173219)
bootstrap-sass (~> 3.4.1)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
@@ -347,7 +371,6 @@ DEPENDENCIES
sass
sassc-rails
selenium-webdriver (~> 3)
- signet (< 0.12)
simplecov (~> 0.7)
simplecov-rcov
sprockets (~> 3.0)
diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index f57baa630..07669244c 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -38,8 +38,8 @@ Gem::Specification.new do |s|
s.files = ["bin/arv", "bin/arv-tag", "LICENSE-2.0.txt"]
s.executables << "arv"
s.executables << "arv-tag"
- s.required_ruby_version = '>= 2.1.0'
- s.add_runtime_dependency 'arvados', '>= 1.4.1.20190320201707'
+ s.required_ruby_version = '>= 2.5.0'
+ s.add_runtime_dependency 'arvados', '>= 2.7.0.dev20230818173219'
# 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/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index 8715adf34..8d3443a27 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
s.files = ["lib/arvados.rb", "lib/arvados/google_api_client.rb",
"lib/arvados/collection.rb", "lib/arvados/keep.rb",
"README", "LICENSE-2.0.txt"]
- s.required_ruby_version = '>= 1.8.7'
+ s.required_ruby_version = '>= 2.5.0'
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
diff --git a/services/api/Gemfile b/services/api/Gemfile
index 21f0232ef..5cd44c007 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -49,8 +49,7 @@ gem 'optimist'
gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails'
-# Import arvados gem.
-gem 'arvados', '~> 2.1.5'
+gem 'arvados', '~> 2.7.0.dev20230818173219'
gem 'httpclient'
gem 'safe_yaml'
@@ -64,10 +63,6 @@ gem 'rails-controller-testing'
gem 'mini_portile2', '~> 2.8', '>= 2.8.1'
-# arvados-google-api-client and googleauth depend on signet, but
-# signet 0.12 is incompatible with ruby 2.3.
-gem 'signet', '< 0.12'
-
# Install any plugin gems
Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|
eval(IO.read(f), binding)
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 2d973fde1..7141c6805 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -53,25 +53,27 @@ GEM
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.5)
+ public_suffix (>= 2.0.2, < 6.0)
andand (1.3.3)
arel (9.0.0)
- arvados (2.1.5)
+ arvados (2.7.0.dev20230818173219)
activesupport (>= 3)
andand (~> 1.3, >= 1.3.3)
- arvados-google-api-client (>= 0.7, < 0.8.9)
- faraday (< 0.16)
+ arvados-google-api-client (>= 0.8.7.5, < 0.8.8)
+ faraday (~> 1.0)
+ faraday-multipart (~> 1.0)
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)
+ arvados-google-api-client (0.8.7.5)
+ activesupport (>= 3.2, < 8.0)
addressable (~> 2.3)
autoparse (~> 0.3)
extlib (~> 0.9)
- faraday (~> 0.9)
- googleauth (~> 0.3)
+ faraday (~> 1.0)
+ faraday-multipart (~> 1.0)
+ googleauth (~> 1.0)
launchy (~> 2.4)
multi_json (~> 1.10)
retriable (~> 1.4)
@@ -91,18 +93,39 @@ GEM
factory_bot_rails (5.0.1)
factory_bot (~> 5.0.0)
railties (>= 4.2.0)
- faraday (0.15.4)
- multipart-post (>= 1.2, < 3)
+ 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)
+ 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-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)
ffi (1.9.25)
globalid (1.1.0)
activesupport (>= 5.0)
- googleauth (0.9.0)
- faraday (~> 0.12)
+ googleauth (1.7.0)
+ faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
- signet (~> 0.7)
+ signet (>= 0.16, < 2.a)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
@@ -110,10 +133,10 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- json (2.5.1)
+ json (2.6.3)
jwt (1.5.6)
- launchy (2.5.0)
- addressable (~> 2.7)
+ launchy (2.5.2)
+ addressable (~> 2.8)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
@@ -138,20 +161,20 @@ GEM
mocha (1.8.0)
metaclass (~> 0.0.1)
multi_json (1.15.0)
- multipart-post (2.1.1)
+ multipart-post (2.3.0)
nio4r (2.5.8)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
oj (3.9.2)
optimist (3.0.0)
- os (1.1.1)
+ os (1.1.4)
passenger (6.0.15)
rack
rake (>= 0.8.1)
pg (1.1.4)
power_assert (1.1.4)
- public_suffix (4.0.6)
+ public_suffix (5.0.3)
racc (1.6.2)
rack (2.2.7)
rack-test (2.1.0)
@@ -198,10 +221,11 @@ GEM
railties (>= 4.2.0, < 6.0)
retriable (1.4.1)
ruby-prof (0.15.9)
+ ruby2_keywords (0.0.5)
safe_yaml (1.0.5)
- signet (0.11.0)
- addressable (~> 2.3)
- faraday (~> 0.9)
+ signet (0.17.0)
+ addressable (~> 2.8)
+ faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simplecov (0.7.1)
@@ -233,7 +257,7 @@ PLATFORMS
DEPENDENCIES
acts_as_api
andand
- arvados (~> 2.1.5)
+ arvados (~> 2.7.0.dev20230818173219)
byebug
factory_bot_rails
httpclient
@@ -256,7 +280,6 @@ DEPENDENCIES
responders (~> 2.0)
ruby-prof (~> 0.15.0)
safe_yaml
- signet (< 0.12)
simplecov (~> 0.7.1)
simplecov-rcov
sprockets (~> 3.0)
diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec
index 1f8252924..3b1b14adc 100644
--- a/services/login-sync/arvados-login-sync.gemspec
+++ b/services/login-sync/arvados-login-sync.gemspec
@@ -36,18 +36,15 @@ Gem::Specification.new do |s|
s.licenses = ['AGPL-3.0']
s.files = ["bin/arvados-login-sync", "agpl-3.0.txt"]
s.executables << "arvados-login-sync"
- s.required_ruby_version = '>= 2.1.0'
+ s.required_ruby_version = '>= 2.5.0'
# Note the letter 'a' at the end of the version dependency. This enables
# 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.4', '> 2.4.4a'
+ s.add_runtime_dependency 'arvados', '~> 2.7.0.dev20230818173219'
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')
- # arvados-google-api-client (and thus arvados) gems
- # depend on signet, but signet 0.12 is incompatible with ruby 2.3.
- s.add_dependency('signet', '< 0.12')
s.homepage =
'https://arvados.org'
end
commit d0713d7531b41a29265e921d12cbb9542116ba1a
Author: Tom Clegg <tom at curii.com>
Date: Fri Aug 18 13:21:27 2023 -0400
20862: Update ruby and cli gem dependencies.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/sdk/cli/Gemfile b/sdk/cli/Gemfile
index 61cf76dbd..f34204e02 100644
--- a/sdk/cli/Gemfile
+++ b/sdk/cli/Gemfile
@@ -6,4 +6,3 @@ source 'https://rubygems.org'
gemspec
gem 'minitest', '>= 5.0.0'
gem 'rake'
-gem 'signet', '<= 0.11'
diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index 1ff841acd..f57baa630 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -42,9 +42,9 @@ Gem::Specification.new do |s|
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*, 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'
+ # We need at least version 0.8.7.5 for compatibility with faraday >= 1.0.
+ s.add_runtime_dependency('arvados-google-api-client', '>= 0.8.7.5', '< 0.8.9')
+ 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'
s.add_runtime_dependency 'andand', '~> 1.3', '>= 1.3.3'
diff --git a/sdk/ruby/Gemfile b/sdk/ruby/Gemfile
index 1972df614..9d3efa124 100644
--- a/sdk/ruby/Gemfile
+++ b/sdk/ruby/Gemfile
@@ -7,4 +7,3 @@ gemspec
gem 'rake'
gem 'minitest', '>= 5.0.0'
gem 'mocha', require: false
-gem 'signet', '<= 0.11'
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index b196a1c33..8715adf34 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -42,13 +42,13 @@ Gem::Specification.new do |s|
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*, 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')
+ # 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('json', '>= 1.7.7', '<3')
- # Avoid warning on Ruby 2.7, cf. https://dev.arvados.org/issues/18247
- s.add_dependency('faraday', '>= 0.17.4')
+ s.add_dependency('faraday', '~> 1.0')
+ s.add_dependency('faraday-multipart', '~> 1.0')
s.add_runtime_dependency('jwt', '<2', '>= 0.1.5')
s.homepage =
'https://arvados.org'
commit c161fce0c125c2c5b9b0ba62288a0e0adb50b19b
Author: Tom Clegg <tom at curii.com>
Date: Fri Aug 18 13:16:06 2023 -0400
20862: Fix use of deprecated stdlib.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 9073d06c1..680c324f5 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -376,7 +376,7 @@ class CollectionsController < ApplicationController
uri.path += 't=' + opts[:path_token] + '/'
end
uri.path += '_/'
- uri.path += URI.escape(file) if file
+ uri.path += ERB::Util.url_encode(file).gsub('%2F', '/') if file
query = Hash[URI.decode_www_form(uri.query || '')]
{ query_token: 'api_token',
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list