projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16039-fuse-forward-slash-sub'
[arvados.git]
/
sdk
/
cwl
/
setup.py
diff --git
a/sdk/cwl/setup.py
b/sdk/cwl/setup.py
index 2b273017e4a06ac60b40fa3c0311a1bff430be15..d4bb6d102a935780e13921fe546119244c0364e1 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,
@@
-22,7
+27,7
@@
setup(name='arvados-cwl-runner',
author='Arvados',
author_email='info@arvados.org',
url="https://arvados.org",
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-v1.0.yml', 'arv-cwl-schema-v1.1.yml']},
license='Apache 2.0',
packages=find_packages(),
package_data={'arvados_cwl': ['arv-cwl-schema-v1.0.yml', 'arv-cwl-schema-v1.1.yml']},
@@
-31,13
+36,14
@@
setup(name='arvados-cwl-runner',
'bin/arvados-cwl-runner',
],
# Note that arvados/build/run-build-packages.sh looks at this
'bin/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.
+ # file to determine what version of cwltool and schema-salad to
+ # build.
install_requires=[
install_requires=[
- 'cwltool==1.0.20190
426175817
',
- 'schema-salad==4.
1.20190305210046
',
+ 'cwltool==1.0.20190
831161204
',
+ 'schema-salad==4.
5.20190815125611
',
'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.3.0.20190205182514'
,
+ 'arvados-python-client
{}'.format(pysdk_dep)
,
'setuptools',
'ciso8601 >= 2.0.0',
'networkx < 2.3'
'setuptools',
'ciso8601 >= 2.0.0',
'networkx < 2.3'
@@
-55,8
+61,8
@@
setup(name='arvados-cwl-runner',
],
test_suite='tests',
tests_require=[
],
test_suite='tests',
tests_require=[
- 'mock>=1.0',
+ 'mock>=1.0
,<4
',
'subprocess32>=3.5.1',
],
'subprocess32>=3.5.1',
],
- zip_safe=True
-
)
+ zip_safe=True
,
+)