Squashed 'cwltool/schemas/' changes from 8d0fe99..25784a9

25784a9 Merge commit '209d0f0325310c3dd891a839fab2e0f41e390425'
209d0f0 Squashed 'v1.0/salad/' changes from 13061e5..c9fc39f

git-subtree-dir: cwltool/schemas
git-subtree-split: 25784a9

Author: Peter Amstutz

cwltool/schemas/v1.0/salad/schema_salad/metaschema/metaschema.yml

@@ -265,7 +265,6 @@ $graph:
 
     - name: specialize
       type:
-        - SpecializeDef?
         - SpecializeDef[]?
       doc: |
         Only applies if `extends` is declared.  Apply type specialization using the

cwltool/schemas/v1.0/salad/schema_salad/metaschema/metaschema_base.yml

@@ -43,19 +43,19 @@ $graph:
   type: record
   doc: A field of a record.
   fields:
-    name:
+    - name: name
       type: string
       jsonldPredicate: "@id"
       doc: |
         The name of the field
 
-    doc:
+    - name: doc
       type: string?
       doc: |
         A documentation string for this field
       jsonldPredicate: "rdfs:comment"
 
-    type:
+    - name: type
       type:
         - PrimitiveType
         - RecordSchema

cwltool/schemas/v1.0/salad/setup.py

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