test of switch to ruamel.yaml (#108)

Author: mr-c

cwltool/cwltest.py

@@ -7,8 +7,8 @@
 import sys
 import shutil
 import tempfile
-import yaml
-import yaml.scanner
+import ruamel.yaml as yaml
+import ruamel.yaml.scanner as yamlscanner
 import pipes
 import logging
 import schema_salad.ref_resolver
@@ -92,7 +92,7 @@ def run_test(args, i, t):  # type: (argparse.Namespace, Any, Dict[str,str]) -> i
             _logger.error(t.get("doc"))
             _logger.error("Returned non-zero")
             return 1
-    except (yaml.scanner.ScannerError, TypeError) as e:
+    except (yamlscanner.ScannerError, TypeError) as e:
         _logger.error(u"""Test failed: %s""", " ".join([pipes.quote(tc) for tc in test_command]))
         _logger.error(outstr)
         _logger.error(u"Parse error %s", str(e))

cwltool/draft2tool.py

@@ -6,7 +6,6 @@
 import os
 from .pathmapper import PathMapper, DockerPathMapper
 from .job import CommandLineJob
-import yaml
 import glob
 import logging
 import hashlib

cwltool/expression.py

@@ -5,7 +5,6 @@
 import logging
 import os
 from .errors import WorkflowException
-import yaml
 import schema_salad.validate as validate
 import schema_salad.ref_resolver
 from . import sandboxjs

cwltool/job.py

@@ -4,7 +4,6 @@
 import tempfile
 import glob
 import json
-import yaml
 import logging
 import sys
 import requests

cwltool/main.py

@@ -19,7 +19,7 @@
 import tempfile
 import schema_salad.jsonld_context
 import schema_salad.makedoc
-import yaml
+import ruamel.yaml as yaml
 import urlparse
 import pkg_resources  # part of setuptools
 import rdflib

cwltool/process.py

@@ -4,8 +4,6 @@
 import json
 import schema_salad.validate as validate
 import copy
-import yaml
-import copy
 import logging
 import pprint
 from .utils import aslist, get_feature

setup.py

@@ -37,7 +37,7 @@
                                 'schemas/draft-4/salad/schema_salad/metaschema/*.md']},
       install_requires=[
           'requests',
-          'PyYAML',
+          'ruamel.yaml',
           'rdflib >= 4.1.0',
           'rdflib-jsonld >= 0.3.0',
           'shellescape',