# HG changeset patch
# User rnateam
# Date 1450428060 18000
# Node ID aff2c7260894c28033071b3412078573bf7260a6
# Parent  5c46d375b837c59abb518d4edefb0881dc0b77cb
integrate dsc and package updates

diff -r 5c46d375b837 -r aff2c7260894 flexbar_dsc.xml
--- a/flexbar_dsc.xml	Fri Dec 18 03:04:46 2015 -0500
+++ b/flexbar_dsc.xml	Fri Dec 18 03:41:00 2015 -0500
@@ -421,14 +421,14 @@
     </stdio>
 
     <outputs>
-        <data format="txt" name="output" metadata_source="reads"/>
         <collection name="list_output" type="list:paired" label="Duplicate List">
       <!-- Use named regex group to grab pattern
            <identifier_0>_<identifier_1>.fq. Here identifier_0 is the list
            identifier in the nested collection and identifier_1 is either
            forward or reverse (for instance samp1_forward.fq).
       -->
-            <discover_datasets pattern="FlexbarOutput_barcode_(?P&lt;identifier_0&gt;[^_]+)_(?P&lt;identifier_1&gt;[^_]+)\.fastq" metadata_source="reads" visible="true" />
+        <data format="txt" name="output" metadata_source="reads"/>
+        <discover_datasets pattern="FlexbarOutput_(?P&lt;identifier_0&gt;[^_]+)_(?P&lt;identifier_1&gt;[^_]+)\.fastq" metadata_source="reads" visible="true" />
         </collection>
     </outputs>
 
diff -r 5c46d375b837 -r aff2c7260894 macros.xml
--- a/macros.xml	Fri Dec 18 03:04:46 2015 -0500
+++ b/macros.xml	Fri Dec 18 03:41:00 2015 -0500
@@ -1,7 +1,7 @@
 <macros>
     <xml name="requirements">
         <requirements>
-            <requirement type="package" version="1.65">biopython</requirement>
+            <requirement type="package" version="1.66">biopython</requirement>
             <requirement type="package" version="0.16">pandas</requirement>
             <requirement type="package" version="0.7.4">pybedtools</requirement>
         </requirements>
diff -r 5c46d375b837 -r aff2c7260894 tool_dependencies.xml
--- a/tool_dependencies.xml	Fri Dec 18 03:04:46 2015 -0500
+++ b/tool_dependencies.xml	Fri Dec 18 03:41:00 2015 -0500
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="biopython" version="1.65">
-        <repository changeset_revision="b3a791f6e3ba" name="package_biopython_1_65" owner="biopython" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="907c57486667" name="package_python_2_7_biopython_1_66" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="pandas" version="0.16">
         <repository changeset_revision="8766fb73e88f" name="package_python_2_7_pandas_0_16" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu" />