Merge pull request #26 from illusional/update-parsers-and-schema-salad

Update parsers + schema salad (>=7 <8)

Author: illusional

cwl_utils/parser_v1_0.py

@@ -26,7 +26,7 @@
 from ruamel import yaml
 from ruamel.yaml.comments import CommentedMap
 from schema_salad.exceptions import SchemaSaladException, ValidationException
-from schema_salad.ref_resolver import Fetcher
+from schema_salad.fetcher import DefaultFetcher, Fetcher
 from schema_salad.sourceline import SourceLine, add_lc_filename
 
 _vocab = {}  # type: Dict[str, str]
@@ -70,7 +70,6 @@ def __init__(
             import requests
             from cachecontrol.wrapper import CacheControl
             from cachecontrol.caches import FileCache
-            from schema_salad.ref_resolver import DefaultFetcher
 
             if "HOME" in os.environ:
                 session = CacheControl(

cwl_utils/parser_v1_1.py

@@ -26,7 +26,7 @@
 from ruamel import yaml
 from ruamel.yaml.comments import CommentedMap
 from schema_salad.exceptions import SchemaSaladException, ValidationException
-from schema_salad.ref_resolver import Fetcher
+from schema_salad.fetcher import DefaultFetcher, Fetcher
 from schema_salad.sourceline import SourceLine, add_lc_filename
 
 _vocab = {}  # type: Dict[str, str]
@@ -70,7 +70,6 @@ def __init__(
             import requests
             from cachecontrol.wrapper import CacheControl
             from cachecontrol.caches import FileCache
-            from schema_salad.ref_resolver import DefaultFetcher
 
             if "HOME" in os.environ:
                 session = CacheControl(

setup.py

@@ -14,7 +14,7 @@
         'ruamel.yaml',
         'six',
         'requests',
-        'schema_salad <7',
+        'schema-salad >= 7, < 8',
         'typing_extensions',
     ],
     setup_requires=['pytest-runner'],