[ARVADOS] updated: 2ddb3dfd39f71e606d1cb51f3924d62db13a4793

[git at public.curoverse.com]

Summary of changes:
 apps/admin/setup-new-user.rb                       | 168 ---------------------
 .../views/pipeline_templates/_show_recent.html.erb |  10 +-
 sdk/python/arvados/commands/put.py                 |   4 +-
 sdk/python/tests/test_arv-put.py                   |   5 +-
 services/api/app/models/pipeline_template.rb       |   1 +
 services/api/app/models/user.rb                    |   4 +-
 ...152921_add_description_to_pipeline_templates.rb |   5 +
 services/api/db/schema.rb                          |   3 +-
 8 files changed, 23 insertions(+), 177 deletions(-)
 delete mode 100755 apps/admin/setup-new-user.rb
 create mode 100644 services/api/db/migrate/20140527152921_add_description_to_pipeline_templates.rb

       via  2ddb3dfd39f71e606d1cb51f3924d62db13a4793 (commit)
       via  a550b96b61de5c8c217ec52b42c6fa9d41035cd6 (commit)
       via  8dce5fd3bb6168b93d7d6c4909e5eee0a904e97d (commit)
       via  40b6a69496aa50349d07daa6b28ae36bddd8a6a4 (commit)
       via  e289f5b586c24baf0bbd74e206d906297751db56 (commit)
       via  a01f0a9b9860ca574e0078a0e95afb783e711dc1 (commit)
       via  5805fc322c7fd0c83eb9805a915aecd693cef5ee (commit)
       via  f049df0d8d69b8f4e235869103be2c814382bcce (commit)
       via  fe84c84827af6092784408629e4cde0663fe6af8 (commit)
      from  491785dcf514640d80b83b32d867002852940140 (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 2ddb3dfd39f71e606d1cb51f3924d62db13a4793
Merge: a550b96 40b6a69
Author: Brett Smith <brett at curoverse.com>
Date:   Wed May 28 13:56:22 2014 -0400

    Merge branch 'master' into 2752-arv-put-resume-wip


commit a550b96b61de5c8c217ec52b42c6fa9d41035cd6
Author: Brett Smith <brett at curoverse.com>
Date:   Wed May 28 13:56:10 2014 -0400

    2752: Fix arv-put's write percentage output.

diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py
index 3926369..496110d 100644
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@ -288,9 +288,9 @@ def machine_progress(bytes_written, bytes_expected):
 
 def human_progress(bytes_written, bytes_expected):
     if bytes_expected:
-        return "\r{}M / {}M {:.1f}% ".format(
+        return "\r{}M / {}M {:.1%} ".format(
             bytes_written >> 20, bytes_expected >> 20,
-            bytes_written / bytes_expected)
+            float(bytes_written) / bytes_expected)
     else:
         return "\r{} ".format(bytes_written)
 
diff --git a/sdk/python/tests/test_arv-put.py b/sdk/python/tests/test_arv-put.py
index 8abdb64..a7a3e89 100644
--- a/sdk/python/tests/test_arv-put.py
+++ b/sdk/python/tests/test_arv-put.py
@@ -301,7 +301,7 @@ class ArvadosPutReportTest(ArvadosBaseTestCase):
 
     def test_known_human_progress(self):
         for count, total in [(0, 1), (2, 4), (45, 60)]:
-            expect = '{:.1f}%'.format(count / total)
+            expect = '{:.1%}'.format(float(count) / total)
             actual = arv_put.human_progress(count, total)
             self.assertTrue(actual.startswith('\r'))
             self.assertIn(expect, actual)

commit 8dce5fd3bb6168b93d7d6c4909e5eee0a904e97d
Author: Brett Smith <brett at curoverse.com>
Date:   Wed May 28 13:55:43 2014 -0400

    2752: Quiet arv-put stdin integration test.

diff --git a/sdk/python/tests/test_arv-put.py b/sdk/python/tests/test_arv-put.py
index 2e57285..8abdb64 100644
--- a/sdk/python/tests/test_arv-put.py
+++ b/sdk/python/tests/test_arv-put.py
@@ -329,7 +329,8 @@ class ArvadosPutTest(ArvadosKeepLocalStoreTestCase):
         # case, because the /proc entry is already gone by the time it tries.
         pipe = subprocess.Popen(
             [sys.executable, arv_put.__file__, '--stream'],
-            stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+            stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+            stderr=open('/dev/null', 'w'))
         pipe.stdin.write('stdin test\n')
         pipe.stdin.close()
         deadline = time.time() + 5

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


hooks/post-receive
--