[ARVADOS] updated: ee4f97a63d5f5d242af592ddb824064815b30999
Git user
git at public.curoverse.com
Tue Oct 25 12:36:41 EDT 2016
Summary of changes:
.../app/assets/javascripts/work_unit_component.js | 1 +
.../views/work_units/_component_detail.html.erb | 20 +--
.../test-package-python-arvados-cwl-runner.sh | 1 +
.../test-package-python-arvados-fuse.sh | 1 +
.../test-package-python-arvados-python-client.sh | 1 +
...t-package-python27-python-arvados-cwl-runner.sh | 6 +
...ackage-python27-python-arvados-python-client.sh | 2 +-
build/run-build-docker-images.sh | 2 +-
build/run-build-packages.sh | 6 +-
sdk/cli/bin/crunch-job | 2 +-
sdk/cwl/arvados_cwl/__init__.py | 24 ++--
sdk/cwl/arvados_cwl/arvcontainer.py | 11 +-
sdk/cwl/arvados_cwl/arvdocker.py | 14 +-
sdk/cwl/arvados_cwl/arvjob.py | 28 ++--
sdk/cwl/arvados_cwl/runner.py | 8 ++
sdk/cwl/setup.py | 15 +++
sdk/cwl/tests/test_job.py | 147 ++++++++++++---------
sdk/cwl/tests/test_make_output.py | 14 +-
sdk/cwl/tests/test_pathmapper.py | 12 +-
sdk/cwl/tests/test_submit.py | 31 +++--
.../api/app/controllers/application_controller.rb | 8 ++
.../controllers/arvados/v1/schema_controller.rb | 4 +
.../app/controllers/user_sessions_controller.rb | 3 +
services/api/app/models/collection.rb | 2 +-
services/api/app/models/container_request.rb | 6 +-
services/api/app/models/user.rb | 36 ++---
services/api/config/application.default.yml | 5 +
...71346_add_use_existing_to_container_requests.rb | 9 ++
services/api/db/structure.sql | 7 +-
services/api/lib/josh_id.rb | 1 +
services/api/test/fixtures/collections.yml | 17 ++-
.../functional/arvados/v1/jobs_controller_test.rb | 13 ++
.../arvados/v1/schema_controller_test.rb | 19 +++
.../api/test/integration/user_sessions_test.rb | 21 ++-
services/api/test/unit/container_request_test.rb | 43 ++++--
services/login-sync/bin/arvados-login-sync | 56 +++++---
services/login-sync/test/test_add_user.rb | 2 +-
tools/arvbox/bin/arvbox | 27 +++-
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 20 ++-
tools/arvbox/lib/arvbox/docker/Dockerfile.demo | 2 +-
tools/arvbox/lib/arvbox/docker/Dockerfile.dev | 11 +-
tools/arvbox/lib/arvbox/docker/common.sh | 7 +-
.../lib/arvbox/docker/service/sdk/run-service | 8 +-
43 files changed, 450 insertions(+), 223 deletions(-)
create mode 120000 build/package-testing/test-package-python-arvados-cwl-runner.sh
create mode 120000 build/package-testing/test-package-python-arvados-fuse.sh
create mode 120000 build/package-testing/test-package-python-arvados-python-client.sh
create mode 100755 build/package-testing/test-package-python27-python-arvados-cwl-runner.sh
create mode 100644 services/api/db/migrate/20161019171346_add_use_existing_to_container_requests.rb
via ee4f97a63d5f5d242af592ddb824064815b30999 (commit)
via c6f81f1d6b7cb51545ed3d681dedd92fc18b054d (commit)
via cd0052e87bfa9d7e3d501427c7ff47e08c68d8d5 (commit)
via 842850ea58a856b93755d5f8990e7473cb034504 (commit)
via 2431a079d91545770bc931fc03afbca81dfa2004 (commit)
via 670b4ba238d93910ff087794d359da0d5ac469fa (commit)
via e8a76617eeec9429ddf7879048a310ba6e15e0d8 (commit)
via a70a555fbd30524568a0e019df184468f28556f0 (commit)
via f61a39eb70046280bd4611ea2dad38a5602303dc (commit)
via b8a53fdbe406c1c46ba39facccec63c5055001bf (commit)
via 91dc5f1d7f5ad9eb2640f6089e2d0476cbf87c8e (commit)
via 68387de8c5b5c5950f2e10d315172658297835b9 (commit)
via d6e4e65cf3aae701c3e02a814329757e869a1d6d (commit)
via d5524135b1495b919de332df4f952926664961f5 (commit)
via cfa2c529c7c8105e4d424b404db2c48ff2066e27 (commit)
via f84926fc3f934ea1958c810637851ec91994fc16 (commit)
via 7e54f217895d2f401563c54704c73a196e2d236d (commit)
via 81d1a618e724c6e9f20f4efa47acbcef4bba5f15 (commit)
via 8ffceeb0bddd457cee62586d405afd8e082e1d6f (commit)
via 1f208cec34df32a83683110b552a1f62767a4852 (commit)
via 360d5f885a6613a506e283ff74b18382249cf929 (commit)
via e9b2c5fc743957598d839e072c49e027752b3287 (commit)
via 6ebfa334f7965f2c4dbe1f52676993dcbd745f65 (commit)
via 5c5e51e7fd601d4e760c76099e3225845d91bb5f (commit)
via b1578a5e964e1a04d8c96c541017c44498e966cb (commit)
via 6bf3b279cd2d5ea5c1d6b849265b7206461467b8 (commit)
via 3ec9630b7d8b4be9d9ca149e45fa5d9cc4ea0f42 (commit)
via 787856704fb3e4421f0367eaca17c7743e844962 (commit)
via cfa2a5ac51c55fa317e1d4a725ebf4fd630b9322 (commit)
via ce5e483d141207a9adddfb82bc8073caaf555907 (commit)
via e8e45c5267f216909382aad7fc976dca82008284 (commit)
via cde03921959a7edbac9f6e969b3b8b99ee3c5b86 (commit)
via 957068e7b647db0bf2188b2c9ed4bc673f0744f2 (commit)
via 162766a3f8e91024f0f40fbc3d5955b899df73a9 (commit)
via f99aa5b85a1aa3bff1f1140f6a109fd308b03d30 (commit)
via e144534106f2031b4a9bec0d80eebf094e33a285 (commit)
via 1658a97ba74320c2da1bed1d5fbfbaa767203e1c (commit)
via b8573fab8e641eab5adc123e9f335510bff65172 (commit)
via 9aecc4974eecdfaf94db275112c2a37601802fe7 (commit)
via f0bc71892f7ba3b2bb42e96598302676faa4a652 (commit)
via 61060582be06315a7a44347acbab9613bf1c4c93 (commit)
from 48c2b107674d60121e7feecf4e884269ba273fdc (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 ee4f97a63d5f5d242af592ddb824064815b30999
Author: radhika <radhika at curoverse.com>
Date: Tue Oct 25 12:35:55 2016 -0400
10079: show spinner when a child component details are being displayed using ajax.
diff --git a/apps/workbench/app/assets/javascripts/work_unit_component.js b/apps/workbench/app/assets/javascripts/work_unit_component.js
index 6c8374b..baff0e8 100644
--- a/apps/workbench/app/assets/javascripts/work_unit_component.js
+++ b/apps/workbench/app/assets/javascripts/work_unit_component.js
@@ -6,6 +6,7 @@ $(document).
}
var content_div = href.find('.work-unit-component-detail-body');
+ content_div.html('<div class="spinner spinner-32px col-sm-1"></div>');
var content_url = href.attr('content-url');
var action_data = href.attr('action-data');
$.ajax(content_url, {dataType: 'html', type: 'POST', data: {action_data: action_data}}).
diff --git a/apps/workbench/app/views/work_units/_component_detail.html.erb b/apps/workbench/app/views/work_units/_component_detail.html.erb
index 1ec5c32..bb5b913 100644
--- a/apps/workbench/app/views/work_units/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_units/_component_detail.html.erb
@@ -1,8 +1,6 @@
<%
- collections = current_obj.outputs.flatten.uniq
- collections << current_obj.docker_image
- collections = collections.compact.uniq
- collections_pdhs = collections.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
+ collections = [current_obj.outputs, current_obj.docker_image].flatten.compact.uniq
+ collections_pdhs = collections.select {|x| !CollectionsHelper.match(x).nil?}.uniq.compact
collections_uuids = collections - collections_pdhs
preload_collections_for_objects collections_uuids if collections_uuids.any?
preload_for_pdhs collections_pdhs if collections_pdhs.any?
@@ -21,10 +19,16 @@
<% keys << :log_collection if @object.uuid != current_obj.uuid %>
<% keys << :outputs %>
<% keys.each do |k| %>
- <% val = current_obj.send(k) if current_obj.respond_to?(k) %>
- <% has_val = val %>
- <% has_val = val.andand.any? if k == :outputs %>
- <% has_val = true if k == :log_collection and current_obj.state_label == "Running" %>
+ <%
+ val = current_obj.send(k) if current_obj.respond_to?(k)
+ if k == :outputs
+ has_val = val.andand.any?
+ elsif k == :log_collection and current_obj.state_label == "Running"
+ has_val = true
+ else
+ has_val = val
+ end
+ %>
<% if has_val %>
<tr>
<td style="padding-right: 1em">
commit c6f81f1d6b7cb51545ed3d681dedd92fc18b054d
Merge: 48c2b10 cd0052e
Author: radhika <radhika at curoverse.com>
Date: Mon Oct 24 11:19:30 2016 -0400
Merge branch 'master' into 10079-pipeline-display-perf
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list