[ARVADOS] updated: 50abee31d6dad724c0d4b8a452eeb330364cde85
git at public.curoverse.com
git at public.curoverse.com
Mon Jul 6 20:56:26 EDT 2015
Summary of changes:
sdk/cwl/README.rst | 1 +
.../commands => cwl/arvados_cwl}/cwl_runner.py | 0
sdk/{python => cwl}/bin/cwl-runner | 0
sdk/cwl/gittaggers.py | 1 +
{services/fuse => sdk/cwl}/setup.py | 26 +++++++++-------------
sdk/python/setup.py | 6 ++---
6 files changed, 15 insertions(+), 19 deletions(-)
create mode 100644 sdk/cwl/README.rst
rename sdk/{python/arvados/commands => cwl/arvados_cwl}/cwl_runner.py (100%)
rename sdk/{python => cwl}/bin/cwl-runner (100%)
create mode 120000 sdk/cwl/gittaggers.py
copy {services/fuse => sdk/cwl}/setup.py (59%)
via 50abee31d6dad724c0d4b8a452eeb330364cde85 (commit)
from 53755b6cb7a0ba9a73a7f1a54c219140e82863d8 (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 50abee31d6dad724c0d4b8a452eeb330364cde85
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Jul 6 13:46:53 2015 -0400
6264: Move cwlrunner into its own module.
diff --git a/sdk/cwl/README.rst b/sdk/cwl/README.rst
new file mode 100644
index 0000000..743b6c6
--- /dev/null
+++ b/sdk/cwl/README.rst
@@ -0,0 +1 @@
+Arvados Common Workflow Language (CWL) runner.
diff --git a/sdk/python/arvados/commands/cwl_runner.py b/sdk/cwl/arvados_cwl/cwl_runner.py
similarity index 100%
rename from sdk/python/arvados/commands/cwl_runner.py
rename to sdk/cwl/arvados_cwl/cwl_runner.py
diff --git a/sdk/python/bin/cwl-runner b/sdk/cwl/bin/cwl-runner
similarity index 100%
rename from sdk/python/bin/cwl-runner
rename to sdk/cwl/bin/cwl-runner
diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
new file mode 120000
index 0000000..d59c02c
--- /dev/null
+++ b/sdk/cwl/gittaggers.py
@@ -0,0 +1 @@
+../python/gittaggers.py
\ No newline at end of file
diff --git a/sdk/python/setup.py b/sdk/cwl/setup.py
similarity index 56%
copy from sdk/python/setup.py
copy to sdk/cwl/setup.py
index 6288eca..3f0f724 100644
--- a/sdk/python/setup.py
+++ b/sdk/cwl/setup.py
@@ -15,9 +15,9 @@ try:
except ImportError:
tagger = egg_info_cmd.egg_info
-setup(name='arvados-python-client',
- version='0.1',
- description='Arvados client library',
+setup(name='arvados-cwl-runner',
+ version='1.0',
+ description='Arvados Commond Workflow Language runner',
long_description=open(README).read(),
author='Arvados',
author_email='info at arvados.org',
@@ -26,27 +26,12 @@ setup(name='arvados-python-client',
license='Apache 2.0',
packages=find_packages(),
scripts=[
- 'bin/arv-copy',
- 'bin/arv-get',
- 'bin/arv-keepdocker',
- 'bin/arv-ls',
- 'bin/arv-normalize',
- 'bin/arv-put',
- 'bin/arv-run',
- 'bin/arv-ws',
'bin/cwl-runner'
],
install_requires=[
- 'ciso8601',
- 'google-api-python-client',
- 'httplib2',
- 'pycurl>=7.19.5.1',
- 'python-gflags',
- 'ws4py',
- 'cwltool'
+ 'cwltool',
+ 'arvados-python-client'
],
- test_suite='tests',
- tests_require=['mock>=1.0', 'PyYAML'],
- zip_safe=False,
+ zip_safe=True,
cmdclass={'egg_info': tagger},
)
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 6288eca..5c0b09d 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -33,8 +33,7 @@ setup(name='arvados-python-client',
'bin/arv-normalize',
'bin/arv-put',
'bin/arv-run',
- 'bin/arv-ws',
- 'bin/cwl-runner'
+ 'bin/arv-ws'
],
install_requires=[
'ciso8601',
@@ -42,8 +41,7 @@ setup(name='arvados-python-client',
'httplib2',
'pycurl>=7.19.5.1',
'python-gflags',
- 'ws4py',
- 'cwltool'
+ 'ws4py'
],
test_suite='tests',
tests_require=['mock>=1.0', 'PyYAML'],
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list