Fix mapSubject fields when $import or $include is provided.

Author: Peter Amstutz

schema_salad/ref_resolver.py

@@ -365,7 +365,9 @@ def resolve_all(self, document, base_url, file_base=None):
 
         if isinstance(document, dict):
             for idmapField in loader.idmap:
-                if idmapField in document and isinstance(document[idmapField], dict):
+                if (idmapField in document and isinstance(document[idmapField], dict) and
+                    "$import" not in document[idmapField] and
+                    "$include" not in document[idmapField]):
                     ls = []
                     for k, v in document[idmapField].items():
                         if not isinstance(v, dict):

setup.py

@@ -41,7 +41,7 @@
 extras_require = {}               # TODO: to be removed when the above is added
 
 setup(name='schema-salad',
-      version='1.10',
+      version='1.11',
       description='Schema Annotations for Linked Avro Data (SALAD)',
       long_description=open(README).read(),
       author='Common workflow language working group',