Merge branch 'cfg2' into master

databio · Apr 30, 2020 · a95fad5 · a95fad5
2 parents 2dc287b + f2ab5ed
commit a95fad5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/pipeline_interface.yaml b/pipeline_interface.yaml
@@ -17,10 +17,3 @@ pipelines:
         cores: "1"
         mem: "12000"
         time: "00-18:00:00"
-
-
-
-
-
-
-
diff --git a/project/cfg.yaml b/project/cfg.yaml
@@ -1,12 +1,13 @@
-metadata:
-  sample_table: bedset_query.csv
+sample_table: bedset_query.csv
+looper:
   output_dir: . 
   pipeline_interfaces: ../pipeline_interface.yaml 
 
-derived_attributes: [JSONquery_path, output_folder_path]
-data_sources:
-  source1: ../tests/{JSONquery_name}.json
-  source2: ../tests/BEDset_output/
-
-constant_attributes:
-  protocol: "bedbuncher"
+sample_modifiers:
+  derive:
+    attributes: [JSONquery_path, output_folder_path]
+    sources:
+      source1: ../tests/{JSONquery_name}.json
+      source2: ../tests/BEDset_output/
+  append:
+    protocol: "bedbuncher"
diff --git a/resources.tsv b/resources.tsv
@@ -0,0 +1,6 @@
+max_file_size	cores	mem	time
+NaN	1	8000	00-04:00:00
+0.05	2	12000	00-08:00:00
+0.5	4	16000	00-12:00:00
+1	8	16000	00-24:00:00
+10	16	32000	02-00:00:00
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,10 +17,3 @@ pipelines:
		cores: "1"
		mem: "12000"
		time: "00-18:00:00"