projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 15209-python-arv-deps-pinned
[arvados.git]
/
sdk
/
cwl
/
setup.py
diff --git
a/sdk/cwl/setup.py
b/sdk/cwl/setup.py
index 9d25a562ab32d09dcdfba627fc2089260879cce1..b59df35c777ee1da5d125ca8504742f7fbaff04b 100644
(file)
--- a/
sdk/cwl/setup.py
+++ b/
sdk/cwl/setup.py
@@
-14,6
+14,11
@@
README = os.path.join(SETUP_DIR, 'README.rst')
import arvados_version
version = arvados_version.get_version(SETUP_DIR, "arvados_cwl")
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,
setup(name='arvados-cwl-runner',
version=version,
@@
-25,7
+30,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,18
+38,26
@@
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
81116032456
',
- 'schema-salad==
2.7.20181116024232
',
+ 'cwltool==1.0.201
90607183319
',
+ '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
{}'.format(pysdk_dep)
,
'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']),
],
+ 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',