[ARVADOS] updated: 1.3.0-1774-g84347b3db
Git user
git at public.curoverse.com
Mon Oct 21 20:17:45 UTC 2019
Summary of changes:
apps/workbench/Gemfile | 4 +++
apps/workbench/Gemfile.lock | 7 ++--
lib/dispatchcloud/scheduler/sync.go | 7 ++++
lib/dispatchcloud/scheduler/sync_test.go | 56 ++++++++++++++++++++++++++++++
sdk/go/keepclient/discover.go | 3 +-
sdk/python/arvados/arvfile.py | 11 +++---
sdk/python/arvados/collection.py | 2 +-
sdk/python/arvados/commands/put.py | 7 ++--
sdk/python/arvados/keep.py | 6 ++--
sdk/python/arvados/retry.py | 15 ++++++++
sdk/python/tests/test_arvfile.py | 2 +-
sdk/python/tests/test_keep_client.py | 12 ++++---
sdk/ruby/lib/arvados/collection.rb | 2 +-
sdk/ruby/test/test_collection.rb | 23 ++++++++++++
services/api/Gemfile | 4 +++
services/api/Gemfile.lock | 7 ++--
services/api/app/helpers/commits_helper.rb | 1 +
services/api/app/models/keep_service.rb | 1 +
services/api/lib/tasks/symbols.rake | 11 ++++--
19 files changed, 154 insertions(+), 27 deletions(-)
create mode 100644 lib/dispatchcloud/scheduler/sync_test.go
via 84347b3dbe7d7140e34e3a67b58e06d3c6b5fa9c (commit)
via fed5a79b5852ebf78d660ec8cb169ce512ad6532 (commit)
via 6f779a6bb29c2139f1b6f9eda7b472117fb8e4b8 (commit)
via aea1693cfc6359a7f290797724ee989bc47b09e0 (commit)
via 703356a1d9442240515b5289b76dbb6fbc33ede1 (commit)
via 49ceaf0593b0b67523279daaf3775a5e4c8e67c5 (commit)
via db9a5a318af1f0be8470bbdfc9a2b31ee88ce931 (commit)
via dd9f2403f43bcb93da5908ddde57d8c0491bb4c2 (commit)
via f2d88aeb934c9159c32e86371668428aa82ccdac (commit)
via 7d8bf1e2c1c487ef24c98b2e79855e6ff6beec76 (commit)
via 21fe2b7c02453ce569325d5aa8e29c5c4f98bc22 (commit)
via 9c54a12f8c73e74c33d33718f164d4b2e4c523e7 (commit)
via 1aed7b29d3d0b86eda47fc290943fc002a8e64c7 (commit)
via 76d560673ee770e55900143b96d32588905dc37a (commit)
from 44ee7219e5363f85208d0813373e096d9e14c059 (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 84347b3dbe7d7140e34e3a67b58e06d3c6b5fa9c
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Mon Oct 21 16:17:10 2019 -0400
15699: Avoid latest signet gem, to stay compatible with ruby 2.3.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 559c2fdc2..40cf4a86c 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -111,3 +111,7 @@ 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 409ed6615..b4b6100f4 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -134,13 +134,13 @@ GEM
flamegraph (0.9.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
- googleauth (0.10.0)
+ googleauth (0.9.0)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
- signet (~> 0.12)
+ signet (~> 0.7)
headless (1.0.2)
highline (2.0.2)
httpclient (2.8.3)
@@ -282,7 +282,7 @@ GEM
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
- signet (0.12.0)
+ signet (0.11.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
@@ -366,6 +366,7 @@ DEPENDENCIES
sass
sassc-rails
selenium-webdriver (~> 3)
+ signet (< 0.12)
simplecov (~> 0.7)
simplecov-rcov
sshkey
diff --git a/services/api/Gemfile b/services/api/Gemfile
index b106ab199..f166505bc 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -75,6 +75,10 @@ gem 'rails-controller-testing'
gem 'sass-rails'
+# 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 e80f87e2a..5ebdff0ca 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -121,13 +121,13 @@ GEM
ffi (1.9.25)
globalid (0.4.2)
activesupport (>= 4.2.0)
- googleauth (0.10.0)
+ googleauth (0.9.0)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
- signet (~> 0.12)
+ signet (~> 0.7)
hashie (3.6.0)
highline (2.0.1)
httpclient (2.8.3)
@@ -254,7 +254,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- signet (0.12.0)
+ signet (0.11.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
@@ -324,6 +324,7 @@ DEPENDENCIES
rvm-capistrano
safe_yaml
sass-rails
+ signet (< 0.12)
simplecov (~> 0.7.1)
simplecov-rcov
sshkey
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list