Bump major version number, because of backwards-incompatible changes. (#63)

Author: tetron

schema_salad/ref_resolver.py

@@ -600,7 +600,7 @@ def resolve_all(self,
         elif isinstance(document, CommentedSeq):
             pass
         elif isinstance(document, (list, dict)):
-            raise Exception("Expected CommentedMap or CommentedSeq, got %s" % type(document))
+            raise Exception("Expected CommentedMap or CommentedSeq, got %s: `%s`" % (type(document), document))
         else:
             return (document, metadata)
 
@@ -902,4 +902,7 @@ def _copy_dict_without_key(from_dict, filtered_key):
     new_dict = copy.copy(from_dict)
     if filtered_key in new_dict:
         del new_dict[filtered_key]  # type: ignore
+    if isinstance(from_dict, CommentedMap):
+        new_dict.lc.data = copy.copy(from_dict.lc.data)
+        new_dict.lc.filename = from_dict.lc.filename
     return new_dict

schema_salad/sourceline.py

@@ -84,18 +84,41 @@ def cmap(d, lc=None, fn=None):  # type: (Union[int, float, str, unicode, Dict, L
         lc = [0, 0, 0, 0]
     if fn is None:
         fn = "test"
+
+    if isinstance(d, CommentedMap):
+        for k,v in d.iteritems():
+            if k in d.lc.data:
+                d[k] = cmap(v, lc=d.lc.data[k], fn=d.lc.filename)
+            else:
+                d[k] = cmap(v, lc, fn=d.lc.filename)
+        return d
+    if isinstance(d, CommentedSeq):
+        for k,v in enumerate(d):
+            if k in d.lc.data:
+                d[k] = cmap(v, lc=d.lc.data[k], fn=d.lc.filename)
+            else:
+                d[k] = cmap(v, lc, fn=d.lc.filename)
+        return d
     if isinstance(d, dict):
         cm = CommentedMap()
         for k,v in d.iteritems():
+            if isinstance(v, CommentedBase):
+                uselc = [v.lc.line, v.lc.col, v.lc.line, v.lc.col]
+            else:
+                uselc = lc
             cm[k] = cmap(v)
-            cm.lc.add_kv_line_col(k, lc)
+            cm.lc.add_kv_line_col(k, uselc)
             cm.lc.filename = fn
         return cm
     if isinstance(d, list):
         cs = CommentedSeq()
         for k,v in enumerate(d):
+            if isinstance(v, CommentedBase):
+                uselc = [v.lc.line, v.lc.col, v.lc.line, v.lc.col]
+            else:
+                uselc = lc
             cs.append(cmap(v))
-            cs.lc.add_kv_line_col(k, lc)
+            cs.lc.add_kv_line_col(k, uselc)
             cs.lc.filename = fn
         return cs
     else:
@@ -119,7 +142,7 @@ def makeError(self, msg):  # type: (Text) -> Any
         if not isinstance(self.item, ruamel.yaml.comments.CommentedBase):
             return self.raise_type(msg)
         errs = []
-        if self.key is None:
+        if self.key is None or self.item.lc.data is None or self.key not in self.item.lc.data:
             lead = "%s:%i:%i:" % (self.item.lc.filename,
                                   self.item.lc.line+1,
                                   self.item.lc.col+1)

setup.py

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