Merge pull request #200 from common-workflow-language/draft-4

[WIP] Draft 4.dev1

Author: mr-c

README.md

@@ -20,6 +20,10 @@ The current stable specification is [draft 3](http://www.commonwl.org/draft-3/):
 
 http://www.commonwl.org/draft-3/
 
+The next work-in-progress specification is [draft 4](http://www.commonwl.org/draft-4/):
+
+http://www.commonwl.org/draft-4/
+
 Older drafts: [draft-1](https://github.com/common-workflow-language/common-workflow-language/tree/master/draft-1), [draft-2](http://www.commonwl.org/draft-2/)
 
 ### Citation
@@ -48,7 +52,7 @@ Some of the software supporting running Common Workflow Language tools or workfl
   [Airflow wiki page](https://github.com/common-workflow-language/common-workflow-language/wiki/SciDAP)
 * [cwl2script](https://github.com/common-workflow-language/cwl2script),
   [cwl2script page](https://github.com/common-workflow-language/common-workflow-language/wiki/cwl2script)
-* [Apache Taverna](http://taverna.incubator.apache.org/), 
+* [Apache Taverna](http://taverna.incubator.apache.org/),
   [Apache Taverna wiki page](https://github.com/common-workflow-language/common-workflow-language/wiki/Taverna)
 
 ## Examples

doc/add-new-draft.md

@@ -0,0 +1,23 @@
+How to make a new draft version of the CWL spec
+
+1. Duplicate prior draft-n directory to draft-n+1 in a branch
+2. Update references to the new draft name.
+3. Pull in the latest metaschema, where `schema_salad_repo` is the remote
+   repository for the schema salad tool.
+     
+     git fetch --all
+     git subtree add -P draft-4/salad schema_salad_repo/master
+
+4. In the reference implementation (cwltool): make a new branch, and update the
+   subtree checkout of the spec:
+   
+     git subtree merge -P cwltool/schemas/ cwl_repo/draft-4
+   
+   Where `cwl_repo` is the remote repository for the CWL specifications.
+4. In the reference implementation, teach it about the new draft version:
+
+  a. Edit `cwltool/update.py`: append a new entry to the updates dictionary and
+     change the previous last version to point to an update function
+  b. Edit `cwltool/process.py`: update `get_schema` to look in the new
+     directory
+  c. Edit `setup.py` to include the new schemas in the `package_data` stanza

draft-2/CommonWorkflowLanguage.yml

@@ -3,6 +3,7 @@ $base: "https://w3id.org/cwl/cwl#"
 $namespaces:
   cwl: "https://w3id.org/cwl/cwl#"
   sld: "https://w3id.org/cwl/salad#"
+  rdfs: "http://www.w3.org/2000/01/rdf-schema#"
 
 $graph:
 
@@ -24,6 +25,7 @@ $graph:
   name: CWLVersions
   doc: "Version symbols for published CWL document versions."
   symbols:
+    - cwl:draft-2
     - cwl:draft-3.dev1
     - cwl:draft-3.dev2
     - cwl:draft-3.dev3
@@ -506,7 +508,7 @@ $graph:
     - name: cwlVersion
       type:
         - "null"
-        - string
+        - "#CWLVersions"
       doc: "CWL document version"
       jsonldPredicate:
         "_id": "cwl:cwlVersion"

draft-3/Process.yml

@@ -0,0 +1,2 @@
+- $import: Process.yml
+- $import: CommandLineTool.yml