13435: Update ruamel.yaml and ciso8601 versions.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/build/build.list b/build/build.list
index e2f2260d20664cfbf3c6f0788cb5e4bde360cf66..e721d20600ec0364a5f8c3e0c61740edcecec552 100644 (file)
--- a/build/build.list
+++ b/build/build.list
@@ -15,7 +15,7 @@ debian8,debian9,ubuntu1404,ubuntu1604,centos7|httplib2|0.9.2|3|python|all
 debian8,debian9,centos7|ws4py|0.3.5|2|python|all
 debian8,debian9,centos7|pykka|1.2.1|2|python|all
 debian8,debian9,ubuntu1404,centos7|six|1.10.0|2|python|all
-debian8,debian9,ubuntu1404,ubuntu1604,centos7|ciso8601|1.0.3|3|python|amd64
+debian8,debian9,ubuntu1404,ubuntu1604,centos7|ciso8601|1.0.6|3|python|amd64
 debian8,debian9,centos7|pycrypto|2.6.1|3|python|amd64
 debian8,debian9,ubuntu1404,ubuntu1604|backports.ssl_match_hostname|3.5.0.1|2|python|all
 debian8,debian9,ubuntu1404,ubuntu1604,centos7|llfuse|1.2|3|python|amd64
@@ -42,7 +42,7 @@ centos7|pyparsing|2.1.10|2|python|all
 centos7|keepalive|0.5|2|python|all
 debian8,debian9,ubuntu1404,ubuntu1604,centos7|lockfile|0.12.2|2|python|all|--epoch 1
 debian8,debian9,ubuntu1404,ubuntu1604,centos7|subprocess32|3.5.0rc1|2|python|all
-all|ruamel.yaml|0.13.7|2|python|amd64|--python-setup-py-arguments --single-version-externally-managed
+all|ruamel.yaml|0.14.12|2|python|amd64|--python-setup-py-arguments --single-version-externally-managed
 all|cwltest|1.0.20180416154033|4|python|all|--depends 'python-futures >= 3.0.5' --depends 'python-subprocess32'
 all|junit-xml|1.8|3|python|all
 all|rdflib-jsonld|0.4.0|2|python|all

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index e8cd721ae296beae02c70a65eeef81e9372f653c..cc5d5da1f0dc9756950d3c7da9174a13e7ad7ddb 100755 (executable)
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -352,7 +352,7 @@ else
 fi
 test_package_presence ${PYTHON2_PKG_PREFIX}-arvados-cwl-runner "$arvados_cwl_runner_version" python "$arvados_cwl_runner_iteration"
 if [[ "$?" == "0" ]]; then
-  fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curoverse, Inc.' 'python' "$arvados_cwl_runner_version" "--url=https://arvados.org" "--description=The Arvados CWL runner" --depends "${PYTHON2_PKG_PREFIX}-setuptools" "${iterargs[@]}"
+  fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curoverse, Inc.' 'python' "$arvados_cwl_runner_version" "--url=https://arvados.org" "--description=The Arvados CWL runner" --depends "${PYTHON2_PKG_PREFIX}-setuptools" --depends "${PYTHON2_PKG_PREFIX}-subprocess32" "${iterargs[@]}"
 fi
 
 # schema_salad. This is a python dependency of arvados-cwl-runner,

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 6c3b5ac005dc2c61e3056deb9e66308617fc8d9b..563015c2cee122c80922e5043c9cf75a8f9558b2 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -36,10 +36,10 @@ setup(name='arvados-cwl-runner',
           'cwltool==1.0.20180502225535',
           'schema-salad==2.7.20180501211602',
           'typing==3.5.3.0',
-          'ruamel.yaml==0.13.7',
+          'ruamel.yaml >=0.13.7, <0.15',
           'arvados-python-client>=1.1.4.20180418202329',
           'setuptools',
-          'ciso8601 >=1.0.0, <=1.0.4',
+          'ciso8601 >=1.0.6'
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 4f487af0a9dbb4065ef08a42d440800e8a547e3c..31cb4407ce566d88495bbec8789950af78830b88 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -46,12 +46,12 @@ setup(name='arvados-python-client',
           ('share/doc/arvados-python-client', ['LICENSE-2.0.txt', 'README.rst']),
       ],
       install_requires=[
-          'ciso8601 >=1.0.0, <=1.0.4',
+          'ciso8601 >=1.0.6',
           'future',
           'google-api-python-client >=1.6.2, <1.7',
           'httplib2 >=0.9.2',
           'pycurl >=7.19.5.1',
-          'ruamel.yaml >=0.13.7',
+          'ruamel.yaml >=0.13.7, <0.15',
           'setuptools',
           'ws4py <0.4',
       ],

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 153d1423e54d5f65f914d73da9e07769cc88351c..d7c9082a48d32d380713fa548255b83d603f907d 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -42,7 +42,7 @@ setup(name='arvados_fuse',
         # llfuse 1.3.4 fails to install via pip
         'llfuse >=1.2, <1.3.4',
         'python-daemon',
-        'ciso8601',
+        'ciso8601 >=1.0.6',
         'setuptools'
         ],
       test_suite='tests',