6264: Move cwlrunner into its own module.

diff --git a/sdk/cwl/README.rst b/sdk/cwl/README.rst
new file mode 100644 (file)
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 (symlink)
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/cwl/setup.py b/sdk/cwl/setup.py
new file mode 100644 (file)
index 0000000..3f0f724
--- /dev/null
+++ b/sdk/cwl/setup.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import setuptools.command.egg_info as egg_info_cmd
+
+from setuptools import setup, find_packages
+
+SETUP_DIR = os.path.dirname(__file__) or '.'
+README = os.path.join(SETUP_DIR, 'README.rst')
+
+try:
+    import gittaggers
+    tagger = gittaggers.EggInfoFromGit
+except ImportError:
+    tagger = egg_info_cmd.egg_info
+
+setup(name='arvados-cwl-runner',
+      version='1.0',
+      description='Arvados Commond Workflow Language runner',
+      long_description=open(README).read(),
+      author='Arvados',
+      author_email='info@arvados.org',
+      url="https://arvados.org",
+      download_url="https://github.com/curoverse/arvados.git",
+      license='Apache 2.0',
+      packages=find_packages(),
+      scripts=[
+          'bin/cwl-runner'
+      ],
+      install_requires=[
+          'cwltool',
+          'arvados-python-client'
+      ],
+      zip_safe=True,
+      cmdclass={'egg_info': tagger},
+      )

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 6288ecad49bd0a61202408dae6f9ad3d462eba59..5c0b09d73096874c0d9e86907cf0fde873dadaa7 100644 (file)
--- 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'],