projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14874-protected-collection-properties
[arvados.git]
/
sdk
/
cwl
/
setup.py
diff --git
a/sdk/cwl/setup.py
b/sdk/cwl/setup.py
index 711796374849c115296e089e31a44729330f45fb..b1c7b90b0d9c66464c81f30986c63e86c4c101d7 100644
(file)
--- a/
sdk/cwl/setup.py
+++ b/
sdk/cwl/setup.py
@@
-25,7
+25,7
@@
setup(name='arvados-cwl-runner',
download_url="https://github.com/curoverse/arvados.git",
license='Apache 2.0',
packages=find_packages(),
download_url="https://github.com/curoverse/arvados.git",
license='Apache 2.0',
packages=find_packages(),
- package_data={'arvados_cwl': ['arv-cwl-schema.yml']},
+ package_data={'arvados_cwl': ['arv-cwl-schema
-v1.0.yml', 'arv-cwl-schema-v1.1
.yml']},
scripts=[
'bin/cwl-runner',
'bin/arvados-cwl-runner',
scripts=[
'bin/cwl-runner',
'bin/arvados-cwl-runner',
@@
-33,15
+33,19
@@
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=[
# 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.201
81217162649
',
- 'schema-salad==
3.0.20181129082112
',
+ 'cwltool==1.0.201
90603140227
',
+ 'schema-salad==
4.2.20190417121603
',
'typing >= 3.6.4',
'ruamel.yaml >=0.15.54, <=0.15.77',
'typing >= 3.6.4',
'ruamel.yaml >=0.15.54, <=0.15.77',
- 'arvados-python-client>=1.
2.1.20181130020805
',
+ 'arvados-python-client>=1.
3.0.20190205182514
',
'setuptools',
'setuptools',
- 'ciso8601 >=
1.0.6, <
2.0.0',
- '
subprocess32>=3.5.1',
+ 'ciso8601 >=
2.0.0',
+ '
networkx < 2.3'
],
],
+ 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']),
],
data_files=[
('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
],