[ARVADOS] updated: aa6a63fb550222ecb8353585ab7e19a2c1d261e4

Git user git at public.curoverse.com
Mon May 8 14:00:00 EDT 2017


Summary of changes:
 .../views/work_units/_component_detail.html.erb    |  24 +-
 build/run-tests.sh                                 |  96 +++---
 doc/Rakefile                                       |   3 +-
 sdk/python/arvados/__init__.py                     |  55 ++--
 sdk/python/arvados/_normalize_stream.py            |   5 +-
 sdk/python/arvados/_ranges.py                      |   8 +-
 sdk/python/arvados/api.py                          |  21 +-
 sdk/python/arvados/arvfile.py                      | 104 ++++---
 sdk/python/arvados/cache.py                        |   9 +-
 sdk/python/arvados/collection.py                   | 106 ++++---
 sdk/python/arvados/commands/_util.py               |   2 -
 sdk/python/arvados/commands/arv_copy.py            |  24 +-
 sdk/python/arvados/commands/get.py                 |  14 +-
 sdk/python/arvados/commands/keepdocker.py          |  11 +-
 sdk/python/arvados/commands/ls.py                  |   5 +-
 sdk/python/arvados/commands/migrate19.py           |  21 +-
 sdk/python/arvados/commands/put.py                 |  56 ++--
 sdk/python/arvados/commands/run.py                 |  15 +-
 sdk/python/arvados/commands/ws.py                  |   5 +-
 sdk/python/arvados/crunch.py                       |   1 +
 sdk/python/arvados/errors.py                       |   4 +-
 sdk/python/arvados/events.py                       |  31 +-
 sdk/python/arvados/keep.py                         |  98 +++---
 sdk/python/arvados/retry.py                        |   8 +-
 sdk/python/arvados/safeapi.py                      |  14 +-
 sdk/python/arvados/stream.py                       |  30 +-
 sdk/python/arvados/timer.py                        |   4 +-
 sdk/python/arvados/util.py                         |   8 +-
 sdk/python/bin/arv-get                             |   2 +-
 sdk/python/setup.py                                |   9 +-
 sdk/python/tests/arvados_testutil.py               |  77 ++++-
 sdk/python/tests/keepstub.py                       | 130 +++++---
 sdk/python/tests/manifest_examples.py              |   5 +-
 .../tests/performance/performance_profiler.py      |  14 +-
 sdk/python/tests/performance/test_a_sample.py      |   7 +-
 sdk/python/tests/run_test_server.py                |  13 +-
 sdk/python/tests/test_api.py                       |  27 +-
 sdk/python/tests/test_arv_copy.py                  |  17 +-
 sdk/python/tests/test_arv_get.py                   |  35 +--
 sdk/python/tests/test_arv_keepdocker.py            |  39 +--
 sdk/python/tests/test_arv_ls.py                    |  25 +-
 sdk/python/tests/test_arv_normalize.py             |  25 +-
 sdk/python/tests/test_arv_put.py                   |  79 ++---
 sdk/python/tests/test_arv_run.py                   |  17 +-
 sdk/python/tests/test_arv_ws.py                    |  16 +-
 sdk/python/tests/test_arvfile.py                   | 343 +++++++++++---------
 sdk/python/tests/test_benchmark_collections.py     |  11 +-
 sdk/python/tests/test_cache.py                     |  20 +-
 sdk/python/tests/test_collections.py               | 344 ++++++++++++---------
 sdk/python/tests/test_errors.py                    |  21 +-
 sdk/python/tests/test_events.py                    |  52 ++--
 sdk/python/tests/test_keep_client.py               | 164 +++++-----
 sdk/python/tests/test_keep_locator.py              |  15 +-
 sdk/python/tests/test_pipeline_template.py         |   3 +-
 sdk/python/tests/test_retry.py                     |  15 +-
 sdk/python/tests/test_retry_job_helpers.py         |   8 +-
 sdk/python/tests/test_stream.py                    |  50 +--
 sdk/python/tests/test_util.py                      |   6 +-
 58 files changed, 1343 insertions(+), 1028 deletions(-)
 mode change 100755 => 100644 sdk/python/arvados/commands/ls.py

       via  aa6a63fb550222ecb8353585ab7e19a2c1d261e4 (commit)
       via  ee434dea5db0b02fe762ff80b2270cf268e84378 (commit)
       via  9bf790498c20c9f8ab9bffbf9c8e5311864bd91e (commit)
       via  8976780c3b66178ab0baf6e305dcc6d72277f815 (commit)
       via  ffb304afad93f50fd6ee43ecda6584dd0ac000c4 (commit)
       via  5ca261ee945cfea279f6df0364c8311e83cebb44 (commit)
       via  fa0ccc4c50e9c141bcd40f12f3047aea3226c0ca (commit)
       via  607fe087f6167061714a524dd53cbbc21b974973 (commit)
       via  3a0d849c08f750dca1d6a40153c0107001769c6d (commit)
       via  2b3b54becbce29efdf4c53787c4aa6d666900ef0 (commit)
       via  31d31c010bb6b5170e3962fdd50c6d393cfe6076 (commit)
       via  a501e1d874f01acc318e7963837fbeb58a29f744 (commit)
       via  b9d004b5369b99b216e66cb7d4a9505792276613 (commit)
       via  f2c1db3480befa2c29a742313465e7cc9f2635b1 (commit)
       via  84737fbdeecd9d9707bef0dde8762d370fba02cb (commit)
       via  ebc9ff19a20c49da45f39379d148b6dc4ccec8e2 (commit)
       via  db7e17f830ac3707d7222d73c2f70f1d726a724c (commit)
       via  0c5cb575c6915778dc6b2de6348bdc32121434eb (commit)
       via  0b8673b62cd9717fcf7e3bbb608ae07018093d6f (commit)
       via  06e1c2317d969fb5872cf1f2c29adaac7e0ef251 (commit)
       via  f6b16b5ae75469167dbea08d69692d5f53dd9c84 (commit)
       via  a603d0f7b685a93b88ea29336dd2b512e63b4508 (commit)
       via  9b976cfbcb62729a672315107ac4868e0dc2f815 (commit)
       via  83f3b04387aff7f033b99a6421e4d38478f09c17 (commit)
       via  62be7d11e2b54d06e4d0c7c6ae12656bfe00637f (commit)
       via  9e3fd2fa437e2f3dab220a96fbe22ec5b250421d (commit)
       via  4a8883858028d4068b52710acd9c349108b6fc7c (commit)
       via  56b51a9e60da1531d40685525a563bef91f17876 (commit)
       via  249b3abab7da1abd531195ed0cd58760bf10774b (commit)
       via  f54096601d61d3d3016317c4b80b3e1a701af869 (commit)
       via  e5d948386bad766d481b17c06bc2c3147c42cde5 (commit)
       via  4ef817417f439188bea95a51d86acf21ad4f6d37 (commit)
       via  0487aeb518af7f4ba4a7b0ae17d42805dcdc3805 (commit)
       via  46f6db136c5820555109963f5382b449aff617ce (commit)
       via  e8074a3ca07250640c30f49cdefbbbe76a4a7885 (commit)
       via  864099344286a29d0552cd59f579f65e2aaf5c92 (commit)
       via  c633f38b9b53c30082407b1f1d9d8c7738c9d680 (commit)
       via  d761fb1e9d9e39626eded4b1e4804b0fc3d5d8c8 (commit)
       via  6d9cf49ee3e11d9ca87c8113222c6dd742597a5f (commit)
       via  adac4b967382c280022d202d56d7fee41764ef35 (commit)
       via  cb37170128fa9b1f1c98bb3270328e0969719141 (commit)
       via  cd708c67b92f2c094e33584bb1fc2c6b4640fb90 (commit)
       via  04f38e70e1a6b23b00eb3684dbefce0ab64ec638 (commit)
       via  991d037e7b4741450dff745d22b0758170fe4ed9 (commit)
       via  82f763b628589918d0e421b4f5fb4c00c179a628 (commit)
       via  41e9f18dc873c0260b5d32523e9b34ea41040f22 (commit)
       via  a81a5f35357a099750f0ba3f65885d14a757349d (commit)
       via  0e0c1400b57d5de8aa8c18dd4897527f905a4b42 (commit)
       via  0199da877b222c751a31d70a6617b92c2a56fe70 (commit)
       via  7fde9a0a090e5f092b946f7569f1350778a47574 (commit)
       via  d1af87de56519cad7ae3c95d636c3c54f37c260b (commit)
       via  8e48567442d2d40bd9f6230f243f75cdbbe03bb1 (commit)
       via  de259910871b7a01ecc199722ea26e6b335ca55e (commit)
       via  fbce7b14ac2ed443a3054262c16689cbebc16f61 (commit)
       via  e61df48303291900581ef4a64dcf97864598c5f4 (commit)
       via  5e46c19fa6f037d41bd196a5418066f9fbe3bdb3 (commit)
       via  f69e114cf6dbe51525e98ca30a52ef3dd4341167 (commit)
       via  9b823dc4b56a3bda5d095a4b3549ea2c0b024fd8 (commit)
       via  d8fef944b2691e8d77df4185f297f205c4975b21 (commit)
      from  b58953e9b4c54757db68dd8661aeb170635643b2 (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 aa6a63fb550222ecb8353585ab7e19a2c1d261e4
Author: radhika <radhika at curoverse.com>
Date:   Mon May 8 13:59:35 2017 -0400

    10645: L&F improvements

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 99ac759..1204e98 100644
--- a/apps/workbench/app/views/work_units/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_units/_component_detail.html.erb
@@ -14,8 +14,8 @@
             <% if current_obj.uuid.nil? %>
               No <%= current_obj.title %> has been submitted yet.
             <% else %>
-            <table>
-              <% keys = [:uuid, :modified_by_user_uuid, :created_at, :started_at, :finished_at, :container_uuid] %>
+            <table class="table table-condensed">
+              <% keys = [:uuid, :modified_by_user_uuid, :created_at, :started_at, :finished_at, :container_uuid, :priority] %>
               <% keys << :log_collection if @object.uuid != current_obj.uuid %>
               <% keys << :outputs %>
               <% keys.each do |k| %>
@@ -60,14 +60,14 @@
             <% end %>
           </div>
           <div class="col-md-6">
-            <table>
+            <table class="table table-condensed">
               <% # link to repo tree/file only if the repo is readable and the commit is a sha1
                  repo = (/^[0-9a-f]{40}$/ =~ current_obj.script_version and
                          current_obj.repository and
                          object_for_dataclass(Repository, current_obj.repository, :name))
                  repo = nil unless repo.andand.http_fetch_url
                  %>
-              <% [:priority, :script, :repository, :script_version, :supplied_script_version, :nondeterministic,
+              <% [:script, :repository, :script_version, :supplied_script_version, :nondeterministic,
                   :runtime_constraints, :requesting_container_uuid].each do |k| %>
                 <% val = current_obj.send(k) if current_obj.respond_to?(k) %>
                 <% if val %>
@@ -143,8 +143,8 @@
             </table>
           </div>
 
-          <div class="col-md-12">
-            <table style="width:100%;">
+          <div class="col-md-11">
+            <table class="table table-condensed" style="table-layout:fixed;">
               <col width="15%" />
               <col width="85%" />
               <% [:command].each do |k| %>
@@ -154,7 +154,7 @@
                   <td valign="top">
                     <%= k.to_s %>:
                   </td>
-                  <td>
+                  <td style="word-wrap: break-all;">
                     <% if k == :command %>
                       <div style="max-height:200px; overflow-y:auto;">
                         <%=val%>
@@ -177,16 +177,16 @@
                   <td valign="top">
                     cwl.input.json:
                   </td>
-                  <td>
-                    <div style="max-height:200px; overflow:auto;">
+                  <td style="word-wrap: break-all;">
+                    <div style="max-height:400px; overflow:auto;">
                       <% mnt_inputs.each_line do |l| %>
                         <% text_part = l %>
                           <% match = l.match /(.*)(\"keep:.*?\")/ %>
                           <% if match and match.size == 3 %>
-                            <% text_part = match[1] %>
-                            <% loc_part = match[2][6..-2] %>
+                            <% text_part = match[1] + '"keep:' %>
+                            <% idx = match[2].rindex('"'); loc_part = match[2][6..idx-1] %>
                           <% end %>
-                          <span style="white-space: pre-wrap; margin: none;"><%= text_part %><%= if loc_part then link_to_arvados_object_if_readable(loc_part, loc_part, friendly_name: true) end %> <% if loc_part then %> <br/> <% end %></span>
+                          <span style="white-space: pre-wrap; margin: none;"><%= text_part %><%= if loc_part then link_to_arvados_object_if_readable(loc_part, loc_part, friendly_name: true) end %><% if loc_part then %><%= match[2][idx] %><br/><% end %></span>
                       <% end %>
                     </div>
                   </td>

commit ee434dea5db0b02fe762ff80b2270cf268e84378
Merge: b58953e 9bf7904
Author: radhika <radhika at curoverse.com>
Date:   Mon May 8 12:42:10 2017 -0400

    Merge branch 'master' into 10645-cr-mounts-display


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list