projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14885: Adds python2 conditional pytz import
[arvados.git]
/
sdk
/
cwl
/
setup.py
diff --git
a/sdk/cwl/setup.py
b/sdk/cwl/setup.py
index 5d373282b6ca8ba3129b28c78e1bbe8934fda005..d97e7428da0488e04009d4a0baeca01bbb18aa8b 100644
(file)
--- a/
sdk/cwl/setup.py
+++ b/
sdk/cwl/setup.py
@@
-33,18
+33,25
@@
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.20181
116032456
',
- 'schema-salad==
2.7.2018111602423
2',
+ 'cwltool==1.0.20181
217162649
',
+ 'schema-salad==
3.0.2018112908211
2',
'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.
1.4.20180607143841
',
+ 'arvados-python-client>=1.
3.0.20190205182514
',
'setuptools',
'setuptools',
- 'ciso8601 >=1.0.6, <2.0.0',
- 'subprocess32>=3.5.1',
+ 'ciso8601 >= 2.0.0',
],
],
+ 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']),
],
+ classifiers=[
+ 'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 3',
+ ],
test_suite='tests',
tests_require=[
'mock>=1.0',
test_suite='tests',
tests_require=[
'mock>=1.0',