X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/64e387b2f4f0fe6c4c7bf16232706c7cf194caf0..cadf55f2a09546812a650668770249d0f23ec9a5:/sdk/cwl/setup.py diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py index d4bb6d102a..e739235953 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 @@ -30,33 +30,24 @@ setup(name='arvados-cwl-runner', download_url="https://github.com/arvados/arvados.git", license='Apache 2.0', packages=find_packages(), - package_data={'arvados_cwl': ['arv-cwl-schema-v1.0.yml', 'arv-cwl-schema-v1.1.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. install_requires=[ - 'cwltool==1.0.20190831161204', - 'schema-salad==4.5.20190815125611', - 'typing >= 3.6.4', - 'ruamel.yaml >=0.15.54, <=0.15.77', + 'cwltool==3.1.20220210171524', + 'schema-salad==8.2.20211116214159', 'arvados-python-client{}'.format(pysdk_dep), 'setuptools', 'ciso8601 >= 2.0.0', - 'networkx < 2.3' + 'networkx < 2.6' ], - extras_require={ - ':os.name=="posix" and python_version<"3"': ['subprocess32 >= 3.5.1'], - ':python_version<"3"': ['pytz'], - }, data_files=[ ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']), ], + python_requires=">=3.5, <4", classifiers=[ - 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 3', ], test_suite='tests',