9567: Avoid ruamel.yaml >0.11.11. refs #9567

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 783d3d6f957cb1fa5b3e167df6c3f5cedd1dfecd..f2894e32c6942dd120e8643dce186c820eeb6bc0 100755 (executable)
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -463,7 +463,8 @@ fpm_build schema_salad "" "" python 1.12.20160610104117
 
 # And schema_salad now depends on ruamel-yaml, which apparently has a braindead setup.py that requires special arguments to build (otherwise, it aborts with 'error: you have to install with "pip install ."'). Sigh.
 # Ward, 2016-05-26
-fpm_build ruamel.yaml "" "" python "" --python-setup-py-arguments "--single-version-externally-managed"
+# ...and schema_salad 1.12.20160610104117 doesn't work with ruamel-yaml > 0.11.11.
+fpm_build ruamel.yaml "" "" python 0.11.11 --python-setup-py-arguments "--single-version-externally-managed"
 
 # And for cwltool we have the same problem as for schema_salad. Ward, 2016-03-17
 fpm_build cwltool "" "" python 1.0.20160630171631

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 131350d5f9ef58aae50757c37e88988b7a96fd1a..4e72091a6b563b6d0a4c4fee740902825f89cd35 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -31,7 +31,8 @@ setup(name='arvados-cwl-runner',
       ],
       install_requires=[
           'cwltool==1.0.20160630171631',
-          'arvados-python-client>=0.1.20160322001610'
+          'arvados-python-client>=0.1.20160322001610',
+          'ruamel.yaml==0.11.11', # this should be declared by schema_salad instead, but see #9567
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),