[ARVADOS] updated: 095872bcc3dc3bec7c3950377eb03ebab39254ba

Git user git at public.curoverse.com
Wed Mar 23 01:58:28 EDT 2016


Summary of changes:
 build/run-build-docker-jobs-image.sh   | 32 +++++++++++++-------------------
 sdk/cwl/arvados_cwl/__init__.py        |  2 +-
 sdk/cwl/tests/test_job.py              |  4 ++--
 sdk/go/crunchrunner/crunchrunner.go    |  2 ++
 services/fuse/arvados_fuse/fusefile.py |  6 ++++++
 5 files changed, 24 insertions(+), 22 deletions(-)

  discards  83b983aad4f2567d0fb269ee1bec677205a174a1 (commit)
  discards  ab214eb1e693bb4c2df1e0665f41ef49e7708da7 (commit)
       via  095872bcc3dc3bec7c3950377eb03ebab39254ba (commit)
       via  1950e3471f08282092c6731f9da58d83a8da77f8 (commit)
       via  1b7ac33e0651087b85f8583c72325d5583b98776 (commit)
       via  7bf10f8b9d2246a9144ef1322e102fe227c7362e (commit)
       via  3e50cdc0ff3c5c8d40d082bf99a43eae3682aa72 (commit)
       via  354ab6f297bb2100b6ebd0c94fa6463a77d18844 (commit)
       via  9df4d7da24ef8be639af1ab806cf833ee544fb45 (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 (83b983aad4f2567d0fb269ee1bec677205a174a1)
            \
             N -- N -- N (095872bcc3dc3bec7c3950377eb03ebab39254ba)

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 095872bcc3dc3bec7c3950377eb03ebab39254ba
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 1950e3471f08282092c6731f9da58d83a8da77f8
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