[ARVADOS] updated: 76ad4467c9b5f223383520f04157b1721a62aa5f
git at public.curoverse.com
git at public.curoverse.com
Thu Oct 16 10:52:01 EDT 2014
Summary of changes:
.../test/functional/collections_controller_test.rb | 9 +
.../_includes/_tutorial_submit_job.liquid | 11 +-
.../running-external-program.html.textile.liquid | 10 +-
.../tutorial-new-pipeline.html.textile.liquid | 27 ---
.../tutorial-submit-job.html.textile.liquid | 38 +---
sdk/cli/bin/arv | 245 +++++++++++++++------
sdk/cli/bin/arv-run-pipeline-instance | 6 +-
sdk/python/arvados/commands/keepdocker.py | 3 +-
sdk/python/arvados/commands/run.py | 8 +-
sdk/python/arvados/commands/ws.py | 94 ++++++++
sdk/python/arvados/events.py | 83 +++++--
sdk/python/bin/arv-ws | 30 +--
sdk/python/tests/test_websockets.py | 29 ++-
services/api/Gemfile | 2 +-
services/api/Gemfile.lock | 8 +-
services/api/app/models/arvados_model.rb | 1 -
services/api/app/models/log.rb | 5 +
services/api/config/initializers/eventbus.rb | 3 +
services/api/lib/eventbus.rb | 35 ++-
services/api/test/integration/websocket_test.rb | 36 +++
services/keepstore/handler_test.go | 113 +++-------
services/keepstore/handlers.go | 17 +-
services/nodemanager/README.rst | 6 +-
services/nodemanager/tests/__init__.py | 11 +-
services/nodemanager/tests/test_clientactor.py | 49 ++---
services/nodemanager/tests/test_computenode.py | 74 ++++---
services/nodemanager/tests/test_daemon.py | 93 ++++----
services/nodemanager/tests/test_jobqueue.py | 4 +-
services/nodemanager/tests/test_nodelist.py | 9 +-
services/nodemanager/tests/test_timedcallback.py | 42 ++--
services/nodemanager/tests/testutil.py | 16 +-
31 files changed, 694 insertions(+), 423 deletions(-)
copy sdk/java/src/test/resources/first_pipeline.json => doc/_includes/_tutorial_submit_job.liquid (61%)
delete mode 100644 doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
create mode 100644 sdk/python/arvados/commands/ws.py
via 76ad4467c9b5f223383520f04157b1721a62aa5f (commit)
via 987c225f9f6845868ee674902090c27a5a064f42 (commit)
via b3f9cef0402c67cf06f825b283d95ef5819ab93f (commit)
via 58014b961247c55093afdd1dab3e290518a54e3e (commit)
via 69441aa2a477099731f36f6e7995fc2ec85c8c86 (commit)
via fe21e5236f596001d22e4b28519d1c5ef32a7e3c (commit)
via 4ff82f5fdc5d0e663da809823f25155d09609cc1 (commit)
via adbea418d67bfe3b30a305c43d22b858d5a81e92 (commit)
via 8cfc0583424956ca6b2a3f1f2efcf751e185aa3a (commit)
via 758d59141102b29371f44512671b9efe0cf62821 (commit)
via 7509b9e08acebd9e28ab2cea7d8b2e383c46859c (commit)
via adb949d39f83b47e1a3cd48a75ec2c6713381cd9 (commit)
via 286f418347570794d15ae26f9c66fd7362c25848 (commit)
via d7f9b8fdb408df9d0dc1d2e9d2dca8b57b6f1365 (commit)
via 61790a81094b7a21109c8607a11ad874d5aecd73 (commit)
via 0474aa89b8f497fd5abaa072f9bc501742cc5b42 (commit)
via d9eca6c665e600063cb2c04b17f38d540eb438f1 (commit)
via 9b50fd83c23a75ef675f6186e9a1d0be511730c9 (commit)
via d13e0b26fef4777842d92ad3c050d6a662823201 (commit)
via b8fdb9089b0ed5213d7b8d8262b65558539fa054 (commit)
via 6bdfed00c27c6034ffe4ad79a05bc9cadd9b9489 (commit)
via 38ba0794f37ce5324a246a9ca5c0ac81e281e0da (commit)
via 704cf4edf9c1f9ff3403a72b383750aaa04a0dfb (commit)
via 55888e63181a0847d3e00344fa9c7c5e747082ae (commit)
via c088fcf0b5aaf31195ec1b94873e93f1fd3ee8ed (commit)
via 67f00f6ddc4570f878fcc64d4bbdc3eb198a48a3 (commit)
via 76d932c4916d15c2ca2668409905da4206cb38b3 (commit)
via 2774760a4ccdb65336e2aad32b5fd57fc7bc5bb3 (commit)
via 5d262f9b0206b79fca198d191d3678415cf5c338 (commit)
via a606b9a9996aa3e8a144a8328acf3f960d8d0057 (commit)
via 2f8d1a30eaca707dff086b52d5809963e6a8cc1c (commit)
via 4fe672034a740836e930733d741017d07f6ffa0c (commit)
via 585fb54b7f76fce5880eba94e05ea45c7c89f980 (commit)
via 6ce66b16c069c6176dca37bbdc275cb286a08dab (commit)
via 9dd2519aa44d751e6f0144226058dc5a98e4bcb5 (commit)
via 3d0cb4307773c5cba2af35fe4eff49fde7f224cc (commit)
from b7fe2ea36c87fa648f019c20679b50ab462aec5a (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 76ad4467c9b5f223383520f04157b1721a62aa5f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Oct 16 10:51:54 2014 -0400
3609: Reenabled support for websockets. Now sets name of pipeline to user's command line.
diff --git a/sdk/python/arvados/commands/run.py b/sdk/python/arvados/commands/run.py
index a15a457..06c4bf8 100644
--- a/sdk/python/arvados/commands/run.py
+++ b/sdk/python/arvados/commands/run.py
@@ -8,7 +8,7 @@ import os
import stat
import put
import time
-#import arvados.command.ws as ws
+import arvados.commands.ws as ws
import subprocess
import logging
@@ -64,6 +64,8 @@ def main(arguments=None):
arvrun_parser.print_help()
return
+ starting_args = args.args
+
reading_into = 2
slots = [[], [], []]
@@ -196,7 +198,7 @@ def main(arguments=None):
component["script_parameters"]["command"] = slots[2:]
pipeline = {
- "name": "",
+ "name": " ".join(starting_args),
"components": {
"command": component
},
@@ -211,7 +213,7 @@ def main(arguments=None):
api = arvados.api('v1')
pi = api.pipeline_instances().create(body=pipeline).execute()
print "Running pipeline %s" % pi["uuid"]
- #ws.main(["--pipeline", pi["uuid"]])
+ ws.main(["--pipeline", pi["uuid"]])
if __name__ == '__main__':
main()
commit 987c225f9f6845868ee674902090c27a5a064f42
Merge: b7fe2ea b3f9cef
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Oct 16 10:45:18 2014 -0400
Merge branch '3609-arv-ws' into 3609-arv-run
Conflicts:
sdk/cli/bin/arv
diff --cc sdk/cli/bin/arv
index 59bdfae,481cd9e..6f56a08
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@@ -112,7 -113,7 +113,7 @@@ def init_confi
end
end
- subcommands = %w(keep pipeline run tag ws edit)
-subcommands = %w(create edit keep pipeline tag ws)
++subcommands = %w(create edit keep pipeline run tag ws)
def check_subcommands client, arvados, subcommand, global_opts, remaining_opts
case subcommand
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list