X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/008769334163409bb933b5c94f057bb717ac6bc0..08078f621c8dbc1ecbd6e030bb0fac848cb6a01c:/sdk/cwl/setup.py

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 8efcb6e7dd..e1a5077fb8 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
@@ -14,6 +14,11 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 
 import arvados_version
 version = arvados_version.get_version(SETUP_DIR, "arvados_cwl")
+if os.environ.get('ARVADOS_BUILDING_VERSION', False):
+    pysdk_dep = "=={}".format(version)
+else:
+    # On dev releases, arvados-python-client may have a different timestamp
+    pysdk_dep = "<={}".format(version)
 
 setup(name='arvados-cwl-runner',
       version=version,
@@ -22,29 +27,35 @@ setup(name='arvados-cwl-runner',
       author='Arvados',
       author_email='info@arvados.org',
       url="https://arvados.org",
-      download_url="https://github.com/curoverse/arvados.git",
+      download_url="https://github.com/arvados/arvados.git",
       license='Apache 2.0',
       packages=find_packages(),
-      package_data={'arvados_cwl': ['arv-cwl-schema.yml']},
-      scripts=[
-          'bin/cwl-runner',
-          'bin/arvados-cwl-runner',
-      ],
+      package_data={'arvados_cwl': ['arv-cwl-schema-v1.0.yml', 'arv-cwl-schema-v1.1.yml', 'arv-cwl-schema-v1.2.yml']},
+      entry_points={"console_scripts": ["cwl-runner=arvados_cwl:main", "arvados-cwl-runner=arvados_cwl:main"]},
       # Note that arvados/build/run-build-packages.sh looks at this
-      # file to determine what version of cwltool and schema-salad to build.
+      # file to determine what version of cwltool and schema-salad to
+      # build.
       install_requires=[
-          'cwltool==1.0.20180524215209',
-          'schema-salad==2.7.20180501211602',
-          'typing >= 3.5.3',
-          'ruamel.yaml >=0.13.11, <0.15',
-          'arvados-python-client>=1.1.4.20180507184611',
-          'setuptools',
-          'ciso8601 >=1.0.6, <2.0.0'
+          'cwltool==3.1.20220907141119',
+          'schema-salad==8.3.20220913105718',
+          'arvados-python-client{}'.format(pysdk_dep),
+          'ciso8601 >= 2.0.0',
+          'networkx < 2.6',
+          'msgpack==1.0.3',
+          'importlib-metadata<5',
+          'setuptools>=40.3.0'
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
       ],
+      python_requires=">=3.5, <4",
+      classifiers=[
+          'Programming Language :: Python :: 3',
+      ],
       test_suite='tests',
-      tests_require=['mock>=1.0'],
-      zip_safe=True
-      )
+      tests_require=[
+          'mock>=1.0,<4',
+          'subprocess32>=3.5.1',
+      ],
+      zip_safe=True,
+)