[ARVADOS] updated: 1.3.0-1664-gae9fc56d6
Git user
git at public.curoverse.com
Mon Sep 30 20:45:02 UTC 2019
Summary of changes:
sdk/cli/arvados-cli.gemspec | 2 ++
sdk/cli/test/test_arv-collection-create.rb | 4 ++--
sdk/cli/test/test_arv-get.rb | 2 +-
sdk/cli/test/test_arv-keep-get.rb | 16 ++++++++--------
sdk/cli/test/test_arv-keep-put.rb | 14 +++++++-------
sdk/cli/test/test_arv-tag.rb | 2 +-
sdk/cli/test/test_arv-ws.rb | 4 ++--
sdk/ruby/arvados.gemspec | 2 ++
services/login-sync/arvados-login-sync.gemspec | 2 ++
9 files changed, 27 insertions(+), 21 deletions(-)
via ae9fc56d6bc8f73be3de765f03c9607cc5d21d98 (commit)
via a57fe1c6957883d973f87c6d99f169a7d5bea0ea (commit)
via cf3dc59e23bb9da48d67b1ff6e35932c17c64ea3 (commit)
via 623a04c28cf042c8d0fbe3b3982d85d54e3a30ed (commit)
via 3185e134320ff732e2bc3ef791133862aeb494ab (commit)
from a994f208a6ab576261721735e4283e7a01759d00 (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 ae9fc56d6bc8f73be3de765f03c9607cc5d21d98
Merge: a994f208a a57fe1c69
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Mon Sep 30 16:44:34 2019 -0400
Merge branch '15673-faraday-pin'
refs #15673
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
commit a57fe1c6957883d973f87c6d99f169a7d5bea0ea
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Mon Sep 30 15:33:53 2019 -0400
15673: Pin faraday below 0.16.
This allows arvados-cli and login-sync to install correctly even if an
older arvados gem (without the faraday pin) is already installed.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index bce7ce5f5..f828e92bd 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -36,6 +36,8 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'andand', '~> 1.3', '>= 1.3.3'
s.add_runtime_dependency 'oj', '~> 3.0'
s.add_runtime_dependency 'curb', '~> 0.8'
+ # arvados-google-api-client 0.8.7.2 is incompatible with faraday 0.16.2
+ s.add_dependency('faraday', '< 0.16')
s.homepage =
'https://arvados.org'
end
diff --git a/services/login-sync/arvados-login-sync.gemspec b/services/login-sync/arvados-login-sync.gemspec
index f998a8f35..36e5ed925 100644
--- a/services/login-sync/arvados-login-sync.gemspec
+++ b/services/login-sync/arvados-login-sync.gemspec
@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
s.executables << "arvados-login-sync"
s.required_ruby_version = '>= 2.1.0'
s.add_runtime_dependency 'arvados', '~> 1.3.0', '>= 1.3.0'
+ # arvados-google-api-client 0.8.7.2 is incompatible with faraday 0.16.2
+ s.add_dependency('faraday', '< 0.16')
s.homepage =
'https://arvados.org'
end
commit cf3dc59e23bb9da48d67b1ff6e35932c17c64ea3
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Mon Sep 30 15:03:06 2019 -0400
15673: Pin faraday gem version.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index d4f04eb37..ef189bb7a 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -33,6 +33,8 @@ Gem::Specification.new do |s|
# 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')
+ # arvados-google-api-client 0.8.7.2 is incompatible with faraday 0.16.2
+ s.add_dependency('faraday', '< 0.16')
s.add_runtime_dependency('jwt', '<2', '>= 0.1.5')
s.homepage =
'https://arvados.org'
commit 623a04c28cf042c8d0fbe3b3982d85d54e3a30ed
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Mon Sep 30 10:00:28 2019 -0400
15673: Fix ruby warnings.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/sdk/cli/test/test_arv-collection-create.rb b/sdk/cli/test/test_arv-collection-create.rb
index 237b2107f..39c50bcc8 100644
--- a/sdk/cli/test/test_arv-collection-create.rb
+++ b/sdk/cli/test/test_arv-collection-create.rb
@@ -20,7 +20,7 @@ class TestCollectionCreate < Minitest::Test
manifest_text: foo_manifest
}.to_json)
end
- assert /^([0-9a-z]{5}-4zz18-[0-9a-z]{15})?$/.match(out)
+ assert(/^([0-9a-z]{5}-4zz18-[0-9a-z]{15})?$/.match(out))
assert_equal '', err
end
@@ -33,7 +33,7 @@ class TestCollectionCreate < Minitest::Test
assert_arv('--format', 'uuid',
'collection', 'create', '--collection', tempfile.path)
end
- assert /^([0-9a-z]{5}-4zz18-[0-9a-z]{15})?$/.match(out)
+ assert(/^([0-9a-z]{5}-4zz18-[0-9a-z]{15})?$/.match(out))
assert_equal '', err
ensure
tempfile.unlink
diff --git a/sdk/cli/test/test_arv-keep-get.rb b/sdk/cli/test/test_arv-keep-get.rb
index 2aa1e6724..f92e51b29 100644
--- a/sdk/cli/test/test_arv-keep-get.rb
+++ b/sdk/cli/test/test_arv-keep-get.rb
@@ -21,7 +21,7 @@ class TestArvKeepGet < Minitest::Test
assert_arv_get false
end
assert_equal '', out
- assert_match /^usage:/, err
+ assert_match(/^usage:/, err)
end
def test_get_version
@@ -38,7 +38,7 @@ class TestArvKeepGet < Minitest::Test
end
$stderr.write err
assert_equal '', err
- assert_match /^usage:/, out
+ assert_match(/^usage:/, out)
end
def test_file_to_dev_stdout
@@ -70,7 +70,7 @@ class TestArvKeepGet < Minitest::Test
out, err = capture_subprocess_io do
assert_arv_get false, @@foo_manifest_locator + '/foo', 'tmp/foo'
end
- assert_match /Local file tmp\/foo already exists/, err
+ assert_match(/Local file tmp\/foo already exists/, err)
assert_equal '', out
assert_equal 'baz', IO.read('tmp/foo')
end
@@ -82,7 +82,7 @@ class TestArvKeepGet < Minitest::Test
out, err = capture_subprocess_io do
assert_arv_get false, @@foo_manifest_locator + '/', 'tmp/'
end
- assert_match /Local file tmp\/foo already exists/, err
+ assert_match(/Local file tmp\/foo already exists/, err)
assert_equal '', out
assert_equal 'baz', IO.read('tmp/foo')
end
@@ -128,7 +128,7 @@ class TestArvKeepGet < Minitest::Test
assert_arv_get false, @@foo_manifest_locator + '/', 'tmp/foo'
end
assert_equal '', out
- assert_match /^usage:/, err
+ assert_match(/^usage:/, err)
end
def test_dir_to_empty_string
@@ -136,7 +136,7 @@ class TestArvKeepGet < Minitest::Test
assert_arv_get false, @@foo_manifest_locator + '/', ''
end
assert_equal '', out
- assert_match /^usage:/, err
+ assert_match(/^usage:/, err)
end
def test_nonexistent_block
@@ -144,7 +144,7 @@ class TestArvKeepGet < Minitest::Test
assert_arv_get false, 'e796ab2294f3e48ec709ffa8d6daf58c'
end
assert_equal '', out
- assert_match /ERROR:/, err
+ assert_match(/ERROR:/, err)
end
def test_nonexistent_manifest
@@ -152,7 +152,7 @@ class TestArvKeepGet < Minitest::Test
assert_arv_get false, 'acbd18db4cc2f85cedef654fccc4a4d8/', 'tmp/'
end
assert_equal '', out
- assert_match /ERROR:/, err
+ assert_match(/ERROR:/, err)
end
def test_manifest_root_to_dir
diff --git a/sdk/cli/test/test_arv-keep-put.rb b/sdk/cli/test/test_arv-keep-put.rb
index 9ac722f67..9fec78e34 100644
--- a/sdk/cli/test/test_arv-keep-put.rb
+++ b/sdk/cli/test/test_arv-keep-put.rb
@@ -22,7 +22,7 @@ class TestArvKeepPut < Minitest::Test
end
$stderr.write err
assert_empty err
- assert_match /^usage:/, out
+ assert_match(/^usage:/, out)
end
def test_raw_stdin
@@ -65,7 +65,7 @@ class TestArvKeepPut < Minitest::Test
assert_equal(false, arv_put('--filename', 'foo', './tmp/empty_dir/.'),
'arv-put --filename refuses directory')
end
- assert_match /^usage:.*error:/m, err
+ assert_match(/^usage:.*error:/m, err)
assert_empty out
end
@@ -76,7 +76,7 @@ class TestArvKeepPut < Minitest::Test
'./tmp/empty_file'),
'arv-put --filename refuses directory')
end
- assert_match /^usage:.*error:/m, err
+ assert_match(/^usage:.*error:/m, err)
assert_empty out
end
@@ -102,7 +102,7 @@ class TestArvKeepPut < Minitest::Test
out, err = capture_subprocess_io do
assert arv_put('--no-cache', '--manifest', '--progress', './tmp/foo')
end
- assert_match /%/, err
+ assert_match(/%/, err)
assert match_collection_uuid(out)
end
@@ -110,8 +110,8 @@ class TestArvKeepPut < Minitest::Test
out, err = capture_subprocess_io do
assert arv_put('--no-cache', '--manifest', '--batch-progress', './tmp/foo')
end
- assert_match /: 0 written 3 total/, err
- assert_match /: 3 written 3 total/, err
+ assert_match(/: 0 written 3 total/, err)
+ assert_match(/: 3 written 3 total/, err)
assert match_collection_uuid(out)
end
@@ -121,7 +121,7 @@ class TestArvKeepPut < Minitest::Test
arv_put('--progress', '--batch-progress', './tmp/foo'),
'arv-put --progress --batch-progress is contradictory')
end
- assert_match /^usage:.*error:/m, err
+ assert_match(/^usage:.*error:/m, err)
assert_empty out
end
diff --git a/sdk/cli/test/test_arv-tag.rb b/sdk/cli/test/test_arv-tag.rb
index 16542ba16..895d0559e 100644
--- a/sdk/cli/test/test_arv-tag.rb
+++ b/sdk/cli/test/test_arv-tag.rb
@@ -20,7 +20,7 @@ class TestArvTag < Minitest::Test
assert_equal false, arv_tag
end
assert_empty out
- assert_match /^usage:/i, err
+ assert_match(/^usage:/i, err)
end
# Test adding and removing a single tag on a single object.
diff --git a/sdk/cli/test/test_arv-ws.rb b/sdk/cli/test/test_arv-ws.rb
index ffdb8656b..49aac8a64 100644
--- a/sdk/cli/test/test_arv-ws.rb
+++ b/sdk/cli/test/test_arv-ws.rb
@@ -9,14 +9,14 @@ class TestArvWs < Minitest::Test
end
def test_arv_ws_get_help
- out, err = capture_subprocess_io do
+ _, err = capture_subprocess_io do
system ('arv-ws -h')
end
assert_equal '', err
end
def test_arv_ws_such_option
- out, err = capture_subprocess_io do
+ _, err = capture_subprocess_io do
system ('arv-ws --junk')
end
refute_equal '', err
commit 3185e134320ff732e2bc3ef791133862aeb494ab
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Mon Sep 30 09:39:25 2019 -0400
15673: Show stderr before giving up failed command.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/sdk/cli/test/test_arv-get.rb b/sdk/cli/test/test_arv-get.rb
index c5ddacb7e..3a00fec94 100644
--- a/sdk/cli/test/test_arv-get.rb
+++ b/sdk/cli/test/test_arv-get.rb
@@ -148,9 +148,9 @@ class TestArvGet < Minitest::Test
def create_arv_object_with_value(value)
out, err = capture_subprocess_io do
system("arv", "tag", "add", value, "--object", "testing")
- assert $?.success?, "Command failure running `arv tag`: #{$?}"
end
assert_equal '', err
+ assert $?.success?, "Command failure running `arv tag`: #{$?}"
assert_operator 0, :<, out.strip.length
out.strip
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list