[ARVADOS] updated: 436105d3e249ad8dc55fb618d0d2c0d8ed29b395

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 6 +++---
 sdk/python/setup.py             | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  436105d3e249ad8dc55fb618d0d2c0d8ed29b395 (commit)
       via  c22b3b27841508c534c6b287ef1508841fd892d4 (commit)
      from  529a648458ceefc02d77abf470a2005a099d9907 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 436105d3e249ad8dc55fb618d0d2c0d8ed29b395
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Mar 29 16:28:27 2016 -0400

    8654: Pin pyasn1_modules to version that is compatible with pyasn1==0.1.7.

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 759e8ff..17f9cb4 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -41,6 +41,7 @@ setup(name='arvados-python-client',
       install_requires=[
           'google-api-python-client==1.4.2',
           'oauth2client >=1.4.6, <2',
+          'pyasn1-modules==0.0.5',
           'ciso8601',
           'httplib2',
           'pycurl >=7.19.5.1, <7.21.5',

commit c22b3b27841508c534c6b287ef1508841fd892d4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Mar 29 16:28:19 2016 -0400

    8654: Fix version string produced by arvados-cwl-runner.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 5c7ec4d..266b14f 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -598,9 +598,9 @@ def versionstring():
     arvcwlpkg = pkg_resources.require("arvados-cwl-runner")
 
     return "%s %s, %s %s, %s %s" % (sys.argv[0],
-                                        "arvados-cwl-runner", arvcwlpkg[0].version,
-                                        "arvados-python-client", cwlpkg[0].version,
-                                        "cwltool", arvpkg[0].version)
+                                    arvcwlpkg[0].version,
+                                    "arvados-python-client", cwlpkg[0].version,
+                                    "cwltool", arvpkg[0].version)
 
 def main(args, stdout, stderr, api_client=None):
     args.insert(0, "--leave-outputs")

-----------------------------------------------------------------------


hooks/post-receive
--