[ARVADOS] updated: 83b983aad4f2567d0fb269ee1bec677205a174a1
Git user
git at public.curoverse.com
Tue Mar 22 17:36:16 EDT 2016
Summary of changes:
discards aeb9376a919d75b17f91acd265ee2d68f6247bfe (commit)
via 83b983aad4f2567d0fb269ee1bec677205a174a1 (commit)
via ab214eb1e693bb4c2df1e0665f41ef49e7708da7 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (aeb9376a919d75b17f91acd265ee2d68f6247bfe)
\
N -- N -- N (83b983aad4f2567d0fb269ee1bec677205a174a1)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 83b983aad4f2567d0fb269ee1bec677205a174a1
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Mar 22 17:29:29 2016 -0400
8697: Move error messages from stdout to stderr.
diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 70e2f42..6dc82c5 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -17,7 +17,7 @@ begin
require 'trollop'
require 'google/api_client'
rescue LoadError => l
- puts $:
+ $stderr.puts $:
abort <<-EOS
#{$0}: fatal: #{l.message}
Some runtime dependencies may be missing.
@@ -132,7 +132,7 @@ if $options[:instance]
abort "#{$0}: syntax error: --instance cannot be combined with --template or --submit."
end
elsif not $options[:template]
- puts "error: you must supply a --template or --instance."
+ $stderr.puts "error: you must supply a --template or --instance."
p.educate
abort
end
commit ab214eb1e693bb4c2df1e0665f41ef49e7708da7
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Mar 22 17:28:39 2016 -0400
8697: Relax version constraints so gem can be used in ruby187/ree projects.
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index 3d090f4..7155ad7 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -18,13 +18,15 @@ 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 = '>= 2.1.0'
+ s.required_ruby_version = '>= 1.8.7'
# activesupport <4.2.6 only because https://dev.arvados.org/issues/8222
- s.add_dependency('activesupport', '>= 3.2.13', '< 4.2.6')
+ s.add_dependency('activesupport', '>= 3', '< 4.2.6')
s.add_dependency('andand', '~> 1.3', '>= 1.3.3')
- s.add_dependency('google-api-client', '~> 0.6.3', '>= 0.6.3')
+ s.add_dependency('google-api-client', '~> 0.8', '<0.9')
+ # work around undeclared dependency on i18n in some activesupport 3.x.x:
+ s.add_dependency('i18n', '~> 0')
s.add_dependency('json', '~> 1.7', '>= 1.7.7')
- s.add_runtime_dependency('jwt', '>= 0.1.5', '< 1.0.0')
+ s.add_runtime_dependency('jwt', '<2', '>= 0.1.5')
s.homepage =
'https://arvados.org'
end
diff --git a/sdk/ruby/lib/arvados.rb b/sdk/ruby/lib/arvados.rb
index 753c518..0c6ddeb 100644
--- a/sdk/ruby/lib/arvados.rb
+++ b/sdk/ruby/lib/arvados.rb
@@ -209,7 +209,7 @@ class Arvados
:parameters => parameters,
:body_object => body,
:headers => {
- authorization: 'OAuth2 '+arvados.config['ARVADOS_API_TOKEN']
+ :authorization => 'OAuth2 '+arvados.config['ARVADOS_API_TOKEN']
})
resp = JSON.parse result.body, :symbolize_names => true
if resp[:errors]
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list