[ARVADOS] created: 1.1.4-699-gb9a322e1a

Git user git at public.curoverse.com
Tue Jul 24 11:43:55 EDT 2018


        at  b9a322e1aba0030f2dc13c2cf71fb581876c68cc (commit)


commit b9a322e1aba0030f2dc13c2cf71fb581876c68cc
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Jul 24 12:43:22 2018 -0300

    13888: Adds arvados-cli dependency back on API server
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 135b8d1d0..0dc38f1e7 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -21,6 +21,9 @@ group :test, :development do
   gem 'mocha', require: false
 end
 
+# We need this dependency because of crunchv1
+gem 'arvados-cli'
+
 # We'll need to update related code prior to Rails 5.
 # See: https://github.com/rails/activerecord-deprecated_finders
 gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 1514ce134..f935f2c07 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -58,6 +58,15 @@ GEM
       i18n (~> 0)
       json (>= 1.7.7, < 3)
       jwt (>= 0.1.5, < 2)
+    arvados-cli (1.1.4.20180723133344)
+      activesupport (>= 3.2.13, < 5)
+      andand (~> 1.3, >= 1.3.3)
+      arvados (~> 0.1, >= 0.1.20150128223554)
+      curb (~> 0.8)
+      google-api-client (~> 0.6, >= 0.6.3, < 0.8.9)
+      json (>= 1.7.7, < 3)
+      oj (~> 3.0)
+      trollop (~> 2.0)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -78,6 +87,7 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
+    curb (0.9.6)
     database_cleaner (1.7.0)
     erubis (2.7.0)
     eventmachine (1.2.6)
@@ -281,6 +291,7 @@ DEPENDENCIES
   acts_as_api
   andand
   arvados (>= 0.1.20150615153458)
+  arvados-cli
   coffee-rails (~> 4.0)
   database_cleaner
   factory_girl_rails
@@ -315,4 +326,4 @@ DEPENDENCIES
   uglifier (~> 2.0)
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list