projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10497: Update cwltool & schema salad versions.
[arvados.git]
/
sdk
/
cwl
/
setup.py
diff --git
a/sdk/cwl/setup.py
b/sdk/cwl/setup.py
index 4adcac4daf87b4f4899fb883bb6fe499e4ee53d0..8c338863e1063f9e65c6a1bbe8caa7e49cd7932d 100644
(file)
--- a/
sdk/cwl/setup.py
+++ b/
sdk/cwl/setup.py
@@
-20,7
+20,7
@@
versionfile = os.path.join(SETUP_DIR, "arvados_cwl/_version.py")
try:
gitinfo = subprocess.check_output(
['git', 'log', '--first-parent', '--max-count=1',
try:
gitinfo = subprocess.check_output(
['git', 'log', '--first-parent', '--max-count=1',
- '--format=format:%H',
SETUP_DIR
]).strip()
+ '--format=format:%H',
gittaggers.choose_version_from()
]).strip()
with open(versionfile, "w") as f:
f.write("__version__ = '%s'\n" % gitinfo)
except Exception as e:
with open(versionfile, "w") as f:
f.write("__version__ = '%s'\n" % gitinfo)
except Exception as e:
@@
-45,11
+45,13
@@
setup(name='arvados-cwl-runner',
'bin/cwl-runner',
'bin/arvados-cwl-runner'
],
'bin/cwl-runner',
'bin/arvados-cwl-runner'
],
- #
Make sure to update arvados/build/run-build-packages.sh as well
- #
when updating the cwltool version pin
.
+ #
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=[
install_requires=[
- 'cwltool==1.0.20161007181528',
- 'arvados-python-client>=0.1.20160826210445'
+ 'cwltool==1.0.20161216212910',
+ 'schema-salad==2.1.20161216210732',
+ 'arvados-python-client>=0.1.20160826210445',
+ 'setuptools'
],
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']),