Merge branch 'master' of github.com:MG-RAST/pipeline

MG-RAST · Aug 22, 2019 · e478a48 · e478a48
2 parents 55f7a85 + 7797879
commit e478a48
Show file tree

Hide file tree

Showing 10 changed files with 682 additions and 580 deletions.
diff --git a/CWL/Data/Baseline/drisee.receipt b/CWL/Data/Baseline/drisee.receipt
@@ -0,0 +1,26 @@
+{
+    "error": {
+        "location": "file:///Users/wltrimbl/git/MG-RAST/pipeline/CWL/Data/Outputs/drisee.error",
+        "basename": "drisee.error",
+        "class": "File",
+        "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+        "size": 0,
+        "path": "/Users/wltrimbl/git/MG-RAST/pipeline/CWL/Data/Outputs/drisee.error"
+    },
+    "info": {
+        "location": "file:///Users/wltrimbl/git/MG-RAST/pipeline/CWL/Data/Outputs/drisee.log",
+        "basename": "drisee.log",
+        "class": "File",
+        "checksum": "sha1$8f8556f60c1df6f94d0a7dc35ba5aa790f49d5bf",
+        "size": 443,
+        "path": "/Users/wltrimbl/git/MG-RAST/pipeline/CWL/Data/Outputs/drisee.log"
+    },
+    "stats": {
+        "location": "file:///Users/wltrimbl/git/MG-RAST/pipeline/CWL/Data/Outputs/drisee.stats",
+        "basename": "drisee.stats",
+        "class": "File",
+        "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+        "size": 0,
+        "path": "/Users/wltrimbl/git/MG-RAST/pipeline/CWL/Data/Outputs/drisee.stats"
+    }
+}
diff --git a/CWL/Data/Baseline/kmer-tool.receipt b/CWL/Data/Baseline/kmer-tool.receipt
@@ -0,0 +1,29 @@
+{
+    "error": {
+        "location": "file:///Users/wltrimbl/git/MG-RAST/pipeline/CWL/outdir/kmer-tool.error",
+        "basename": "kmer-tool.error",
+        "class": "File",
+        "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+        "size": 0,
+        "path": "/Users/wltrimbl/git/MG-RAST/pipeline/CWL/outdir/kmer-tool.error"
+    },
+    "stats": {
+        "length": 21,
+        "file": {
+            "location": "file:///Users/wltrimbl/git/MG-RAST/pipeline/CWL/outdir/qc.kmer.21.stats",
+            "basename": "qc.kmer.21.stats",
+            "class": "File",
+            "checksum": "sha1$d8025ac54c11b0a89534045cf8f7129172d1698f",
+            "size": 5527,
+            "path": "/Users/wltrimbl/git/MG-RAST/pipeline/CWL/outdir/qc.kmer.21.stats"
+        }
+    },
+    "summary": {
+        "location": "file:///Users/wltrimbl/git/MG-RAST/pipeline/CWL/outdir/kmer-tool.log",
+        "basename": "kmer-tool.log",
+        "class": "File",
+        "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+        "size": 0,
+        "path": "/Users/wltrimbl/git/MG-RAST/pipeline/CWL/outdir/kmer-tool.log"
+    }
+}
diff --git a/CWL/Tests/testTools.py b/CWL/Tests/testTools.py