X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/198a3409881f5b9f1fe77ae551efde1968bfb639..9fa635c9dc288317f19471291accecf8690f5718:/sdk/cwl/setup.py

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index d9dd970c82..55548130d3 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -3,25 +3,17 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import absolute_import
 import os
 import sys
-import subprocess
-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')
 
-tagger = egg_info_cmd.egg_info
-version = os.environ.get("ARVADOS_BUILDING_VERSION")
-if not version:
-    version = ""
-    try:
-        import gittaggers
-        tagger = gittaggers.EggInfoFromGit
-    except ImportError:
-        pass
+import arvados_version
+version = arvados_version.get_version(SETUP_DIR, "arvados_cwl")
 
 setup(name='arvados-cwl-runner',
       version=version,
@@ -41,19 +33,18 @@ setup(name='arvados-cwl-runner',
       # 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.20180326152342',
-          'schema-salad==2.6.20171201034858',
-          'typing==3.5.3.0',
-          'ruamel.yaml==0.13.7',
-          'arvados-python-client>=0.1.20170526013812',
+          'cwltool==1.0.20180615183820',
+          'schema-salad==2.7.20180501211602',
+          'typing >= 3.5.3',
+          'ruamel.yaml >=0.13.11, <0.15',
+          'arvados-python-client>=1.1.4.20180607143841',
           'setuptools',
-          'ciso8601 >=1.0.0, <=1.0.4',
+          'ciso8601 >=1.0.6, <2.0.0'
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
       ],
       test_suite='tests',
       tests_require=['mock>=1.0'],
-      zip_safe=True,
-      cmdclass={'egg_info': tagger},
+      zip_safe=True
       )