[ARVADOS] updated: 23cdaa559272388135e1a5c3d1cc64cfe6e422d5
Git user
git at public.curoverse.com
Tue Dec 13 16:32:00 EST 2016
Summary of changes:
build/run-build-packages-one-target.sh | 1 -
build/run-build-packages.sh | 8 +-
build/run-tests.sh | 4 -
doc/user/cwl/cwl-run-options.html.textile.liquid | 46 +-
.../getting_started/workbench.html.textile.liquid | 2 +-
...nning-pipeline-command-line.html.textile.liquid | 2 +-
.../running-external-program.html.textile.liquid | 2 +-
.../tutorial-submit-job.html.textile.liquid | 2 +-
sdk/cli/test/test_arv-keep-get.rb | 8 +
sdk/cwl/setup.py | 3 +-
sdk/go/logger/logger.go | 204 -----
sdk/go/logger/util.go | 20 -
sdk/go/util/util.go | 34 -
sdk/python/arvados/_version.py | 3 +
sdk/python/arvados/commands/arv_copy.py | 4 +
sdk/python/arvados/commands/keepdocker.py | 5 +
sdk/python/arvados/commands/ls.py | 6 +
sdk/python/arvados/commands/put.py | 4 +
sdk/python/arvados/commands/run.py | 36 +-
sdk/python/arvados/commands/ws.py | 4 +
sdk/python/bin/arv-get | 5 +
sdk/python/bin/arv-normalize | 14 +-
sdk/python/setup.py | 1 +
sdk/python/tests/arvados_testutil.py | 13 +
sdk/python/tests/test_arv_copy.py | 29 +
sdk/python/tests/test_arv_keepdocker.py | 30 +
sdk/python/tests/test_arv_ls.py | 15 +-
sdk/python/tests/test_arv_normalize.py | 27 +
sdk/python/tests/test_arv_put.py | 10 +
sdk/python/tests/test_arv_run.py | 29 +
sdk/python/tests/test_arv_ws.py | 15 +
services/datamanager/collection/collection.go | 408 ----------
services/datamanager/collection/collection_test.go | 202 -----
services/datamanager/collection/testing.go | 61 --
services/datamanager/datamanager.go | 220 -----
services/datamanager/datamanager_test.go | 732 -----------------
services/datamanager/experimental/datamanager.py | 887 ---------------------
.../datamanager/experimental/datamanager_test.py | 41 -
services/datamanager/keep/keep.go | 551 -------------
services/datamanager/keep/keep_test.go | 278 -------
services/datamanager/loggerutil/loggerutil.go | 52 --
services/datamanager/summary/canonical_string.go | 30 -
services/datamanager/summary/file.go | 115 ---
services/datamanager/summary/pull_list.go | 215 -----
services/datamanager/summary/pull_list_test.go | 272 -------
services/datamanager/summary/summary.go | 277 -------
services/datamanager/summary/summary_test.go | 220 -----
services/datamanager/summary/trash_list.go | 62 --
services/datamanager/summary/trash_list_test.go | 76 --
services/fuse/arvados_fuse/_version.py | 3 +
services/fuse/arvados_fuse/command.py | 4 +
services/fuse/setup.py | 3 +-
services/fuse/tests/test_command_args.py | 16 +
services/nodemanager/arvnodeman/_version.py | 3 +
services/nodemanager/arvnodeman/launcher.py | 10 +-
services/nodemanager/setup.py | 1 +
services/nodemanager/tests/test_arguments.py | 27 +
services/nodemanager/tests/testutil.py | 17 +-
58 files changed, 354 insertions(+), 5015 deletions(-)
delete mode 100644 sdk/go/logger/logger.go
delete mode 100644 sdk/go/logger/util.go
delete mode 100644 sdk/go/util/util.go
create mode 100644 sdk/python/arvados/_version.py
create mode 100644 sdk/python/tests/test_arv_copy.py
create mode 100644 sdk/python/tests/test_arv_keepdocker.py
create mode 100644 sdk/python/tests/test_arv_normalize.py
create mode 100644 sdk/python/tests/test_arv_run.py
delete mode 100644 services/datamanager/collection/collection.go
delete mode 100644 services/datamanager/collection/collection_test.go
delete mode 100644 services/datamanager/collection/testing.go
delete mode 100644 services/datamanager/datamanager.go
delete mode 100644 services/datamanager/datamanager_test.go
delete mode 100755 services/datamanager/experimental/datamanager.py
delete mode 100755 services/datamanager/experimental/datamanager_test.py
delete mode 100644 services/datamanager/keep/keep.go
delete mode 100644 services/datamanager/keep/keep_test.go
delete mode 100644 services/datamanager/loggerutil/loggerutil.go
delete mode 100644 services/datamanager/summary/canonical_string.go
delete mode 100644 services/datamanager/summary/file.go
delete mode 100644 services/datamanager/summary/pull_list.go
delete mode 100644 services/datamanager/summary/pull_list_test.go
delete mode 100644 services/datamanager/summary/summary.go
delete mode 100644 services/datamanager/summary/summary_test.go
delete mode 100644 services/datamanager/summary/trash_list.go
delete mode 100644 services/datamanager/summary/trash_list_test.go
create mode 100644 services/fuse/arvados_fuse/_version.py
create mode 100644 services/nodemanager/arvnodeman/_version.py
create mode 100644 services/nodemanager/tests/test_arguments.py
via 23cdaa559272388135e1a5c3d1cc64cfe6e422d5 (commit)
via 49a647b963d16c7035d514ea6a09a11afe3a5d19 (commit)
via d070d1e50551b9c84e4705406a435b1b50f84a08 (commit)
via 3265a76b23fc57ae22ddce95a589c019abce503c (commit)
via 20d7a8b075490d434b6513eea24e99ff257601e6 (commit)
via 4a71cc82448046d28600d9788f523ece07649e2f (commit)
via 47a5c66948792602f657e5e1157bfd172d23c546 (commit)
via 0514b290f5ff9a2700b599bf6fb19a468a73c3fb (commit)
via feb463839301b0b596089e48a981660365d2c4a7 (commit)
via ceae525c9b247a5c66094c0a733b62b3038c8fea (commit)
via f88d5e28703e3de0e02a05df6d472effb03fc6a8 (commit)
via de78c0abbfdd23deebd1bc6b57a63c745c1cee12 (commit)
via fee8873d0c5eeec1bd838161357679de1a3fe0cb (commit)
via 128766dfc5826eafb5768d49461019dee980baa4 (commit)
via 8cd17455f6cd86df7d9f9e66a24437aab25f0380 (commit)
via b29cc280e5220c7de3d24c3acc687be88bbcb29b (commit)
from 3da0fb0eef35b665c9c427fa9acf9b932dd45062 (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 23cdaa559272388135e1a5c3d1cc64cfe6e422d5
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Dec 13 16:31:58 2016 -0500
10576: Fix formatting in cwl-run-options. Fix dangling refs tutorial-pipeline-workbench.html
diff --git a/doc/user/cwl/cwl-run-options.html.textile.liquid b/doc/user/cwl/cwl-run-options.html.textile.liquid
index fea1e51..c9b18e6 100644
--- a/doc/user/cwl/cwl-run-options.html.textile.liquid
+++ b/doc/user/cwl/cwl-run-options.html.textile.liquid
@@ -8,29 +8,29 @@ The following command line options are available for @arvados-cwl-runner@:
table(table table-bordered table-condensed).
|_. Option |_. Description |
-| --basedir BASEDIR| Base directory used to resolve relative references in the input, default to directory of input object file or current directory (if inputs piped/provided on command line).|
-| --version| Print version and exit|
-| --verbose| Default logging|
-| --quiet| Only print warnings and errors.|
-| --debug| Print even more logging|
-| --tool-help| Print command line help for tool|
-| --enable-reuse|Enable job reuse (default)|
-| --disable-reuse|Disable job reuse (always run new jobs).|
-| --project-uuid UUID| Project that will own the workflow jobs, if not provided, will go to home project.|
-| --output-name OUTPUT_NAME|Name to use for collection that stores the final output.|
-| --output-tags OUTPUT_TAGS|Tags for the final output collection separated by commas, e.g., '--output-tags tag0,tag1,tag2'.|
-| --ignore-docker-for-reuse|Ignore Docker image version when deciding whether to reuse past jobs.|
-| --submit| Submit workflow to run on Arvados.|
-| --local| Control workflow from local host (submits jobs to Arvados).|
-| --create-template| (Deprecated) synonym for --create-workflow.|
-| --create-workflow| Create an Arvados workflow (if using the 'containers' API) or pipeline template (if using the 'jobs' API). See --api.|
-| --update-workflow UUID|Update an existing Arvados workflow or pipeline template with the given UUID.|
-| --wait| After submitting workflow runner job, wait for completion.|
-| --no-wait| Submit workflow runner job and exit.|
-| --api WORK_API| Select work submission API, one of 'jobs' or 'containers'. Default is 'jobs' if that API is available, otherwise 'containers'.|
-| --compute-checksum| Compute checksum of contents while collecting outputs|
-| --submit-runner-ram SUBMIT_RUNNER_RAM|RAM (in MiB) required for the workflow runner job (default 1024)|
-| --name NAME| Name to use for workflow execution instance.|
+|==--basedir== BASEDIR| Base directory used to resolve relative references in the input, default to directory of input object file or current directory (if inputs piped/provided on command line).|
+|==--version==| Print version and exit|
+|==--verbose==| Default logging|
+|==--quiet==| Only print warnings and errors.|
+|==--debug==| Print even more logging|
+|==--tool-help==| Print command line help for tool|
+|==--enable-reuse==|Enable job reuse (default)|
+|==--disable-reuse==|Disable job reuse (always run new jobs).|
+|==--project-uuid UUID==| Project that will own the workflow jobs, if not provided, will go to home project.|
+|==--output-name OUTPUT_NAME==|Name to use for collection that stores the final output.|
+|==--output-tags OUTPUT_TAGS==|Tags for the final output collection separated by commas, e.g., =='--output-tags tag0,tag1,tag2'==.|
+|==--ignore-docker-for-reuse==|Ignore Docker image version when deciding whether to reuse past jobs.|
+|==--submit==| Submit workflow to run on Arvados.|
+|==--local==| Control workflow from local host (submits jobs to Arvados).|
+|==--create-template==| (Deprecated) synonym for ==--create-workflow.==|
+|==--create-workflow==| Create an Arvados workflow (if using the 'containers' API) or pipeline template (if using the 'jobs' API). See ==--api==.|
+|==--update-workflow== UUID|Update an existing Arvados workflow or pipeline template with the given UUID.|
+|==--wait==| After submitting workflow runner job, wait for completion.|
+|==--no-wait==| Submit workflow runner job and exit.|
+|==--api== WORK_API| Select work submission API, one of 'jobs' or 'containers'. Default is 'jobs' if that API is available, otherwise 'containers'.|
+|==--compute-checksum==| Compute checksum of contents while collecting outputs|
+|==--submit-runner-ram== SUBMIT_RUNNER_RAM|RAM (in MiB) required for the workflow runner job (default 1024)|
+|==--name== NAME| Name to use for workflow execution instance.|
h3. Specify workflow and output names
diff --git a/doc/user/getting_started/workbench.html.textile.liquid b/doc/user/getting_started/workbench.html.textile.liquid
index a64727f..b397bf4 100644
--- a/doc/user/getting_started/workbench.html.textile.liquid
+++ b/doc/user/getting_started/workbench.html.textile.liquid
@@ -12,6 +12,6 @@ If you are using the default Arvados instance for this guide, you can Access Arv
You may be asked to log in using a Google account. Arvados uses only your name and email address from Google services for identification, and will never access any personal information. If you are accessing Arvados for the first time, the Workbench may indicate your account status is *New / inactive*. If this is the case, contact the administrator of the Arvados instance to request activation of your account.
-Once your account is active, logging in to the Workbench will present you with the Dashboard. This gives a summary of your projects and recent activity in the Arvados instance. "You are now ready to run your first pipeline.":{{ site.baseurl }}/user/tutorials/tutorial-pipeline-workbench.html
+Once your account is active, logging in to the Workbench will present you with the Dashboard. This gives a summary of your projects and recent activity in the Arvados instance. "You are now ready to run your first pipeline.":{{ site.baseurl }}/user/tutorials/tutorial-workflow-workbench.html
!{display: block;margin-left: 25px;margin-right: auto;border:1px solid lightgray;}{{ site.baseurl }}/images/workbench-dashboard.png!
diff --git a/doc/user/topics/running-pipeline-command-line.html.textile.liquid b/doc/user/topics/running-pipeline-command-line.html.textile.liquid
index 14c88d1..c4d3d29 100644
--- a/doc/user/topics/running-pipeline-command-line.html.textile.liquid
+++ b/doc/user/topics/running-pipeline-command-line.html.textile.liquid
@@ -8,7 +8,7 @@ title: "Running an Arvados pipeline"
If the Jobs API is not available, use the "Common Workflow Language":{{site.baseurl}}/user/cwl/cwl-runner.html instead.
{% include 'crunch1only_end' %}
-This tutorial demonstrates how to use the command line to run the same pipeline as described in "running a pipeline using Workbench.":{{site.baseurl}}/user/tutorials/tutorial-pipeline-workbench.html
+This tutorial demonstrates how to use the command line to run the same pipeline as described in "running a pipeline using Workbench.":{{site.baseurl}}/user/tutorials/tutorial-workflow-workbench.html
{% include 'tutorial_expectations' %}
{% include 'tutorial_cluster_name' %}
diff --git a/doc/user/tutorials/running-external-program.html.textile.liquid b/doc/user/tutorials/running-external-program.html.textile.liquid
index a768259..bdd943d 100644
--- a/doc/user/tutorials/running-external-program.html.textile.liquid
+++ b/doc/user/tutorials/running-external-program.html.textile.liquid
@@ -55,7 +55,7 @@ See the "run-command reference":{{site.baseurl}}/user/topics/run-command.html fo
h2. Running your pipeline
-Your new pipeline template should appear at the top of the Workbench "pipeline templates":{{site.arvados_workbench_host}}/pipeline_templates page. You can run your pipeline "using Workbench":tutorial-pipeline-workbench.html or the "command line.":{{site.baseurl}}/user/topics/running-pipeline-command-line.html
+Your new pipeline template should appear at the top of the Workbench "pipeline templates":{{site.arvados_workbench_host}}/pipeline_templates page. You can run your pipeline "using Workbench":tutorial-workflow-workbench.html or the "command line.":{{site.baseurl}}/user/topics/running-pipeline-command-line.html
Test data is available in the "Arvados Tutorial":{{site.arvados_workbench_host}}/projects/qr1hi-j7d0g-u7zg1qdaowykd8d project:
diff --git a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
index d1556cf..fe80dcb 100644
--- a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
+++ b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
@@ -85,6 +85,6 @@ In the editor, enter the following template:
h2. Running your pipeline
-Your new pipeline template should appear at the top of the Workbench "pipeline templates":{{site.arvados_workbench_host}}/pipeline_templates page. You can run your pipeline "using Workbench":tutorial-pipeline-workbench.html or the "command line.":{{site.baseurl}}/user/topics/running-pipeline-command-line.html
+Your new pipeline template should appear at the top of the Workbench "pipeline templates":{{site.arvados_workbench_host}}/pipeline_templates page. You can run your pipeline "using Workbench":tutorial-workflow-workbench.html or the "command line.":{{site.baseurl}}/user/topics/running-pipeline-command-line.html
For more information and examples for writing pipelines, see the "pipeline template reference":{{site.baseurl}}/api/methods/pipeline_templates.html
commit 49a647b963d16c7035d514ea6a09a11afe3a5d19
Merge: 3da0fb0 d070d1e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Dec 13 15:51:24 2016 -0500
Merge branch 'master' into 10576-cwl-keep-fetcher
Conflicts:
sdk/cwl/setup.py
diff --cc sdk/cwl/setup.py
index 069c06d,7a8ec3a..3750a7e
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@@ -45,12 -45,12 +45,13 @@@ setup(name='arvados-cwl-runner'
'bin/cwl-runner',
'bin/arvados-cwl-runner'
],
- # Make sure to update arvados/build/run-build-packages.sh as well
- # when updating the cwltool version pin.
+ # Note that arvados/build/run-build-packages.sh looks at this
+ # file to determine what version of cwltool and schema-salad to build.
install_requires=[
- 'cwltool==1.0.20161128202906',
+ 'cwltool==1.0.20161207161158',
+ 'schema-salad==1.21.20161206204028',
- 'arvados-python-client>=0.1.20160826210445'
+ 'arvados-python-client>=0.1.20160826210445',
+ 'setuptools'
],
data_files=[
('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list