Merge branch 'master' into user_pf2

4dn-dcic · Jun 8, 2018 · 8907a26 · 8907a26
2 parents 4e7149c + 2276a82
commit 8907a26
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/wranglertools/get_field_info.py b/wranglertools/get_field_info.py
@@ -118,13 +118,14 @@ class FieldInfo(object):
 
 sheet_order = [
     "User", "Award", "Lab", "Document", "Protocol", "Publication", "Organism",
-    "IndividualMouse", "IndividualHuman", "Vendor", "Enzyme", "Construct", "TreatmentRnai",
-    "TreatmentChemical", "GenomicRegion", "Target", "Antibody", "Modification",  "Image",
-    "Biosource", "BiosampleCellCulture", "Biosample",  "FileFastq",
-    "FileProcessed", "FileReference", "FileCalibration", "FileSet", "FileSetCalibration",
-    "MicroscopeSettingD1", "MicroscopeSettingD2", "MicroscopeSettingA1", "MicroscopeSettingA2",
-    "FileMicroscopy", "FileSetMicroscopeQc", "ImagingPath", "ExperimentMic", "ExperimentMic_Path",
-    "ExperimentHiC", "ExperimentCaptureC", "ExperimentRepliseq", "ExperimentAtacseq",
+    "IndividualMouse", "IndividualFly", "IndividualHuman", "Vendor", "Enzyme",
+    "Construct", "TreatmentRnai", "TreatmentAgent", "GenomicRegion", "Target",
+    "Antibody", "Modification",  "Image", "Biosource", "BiosampleCellCulture",
+    "Biosample",  "FileFastq", "FileProcessed", "FileReference", "FileCalibration",
+    "FileSet", "FileSetCalibration", "MicroscopeSettingD1", "MicroscopeSettingD2",
+    "MicroscopeSettingA1", "MicroscopeSettingA2", "FileMicroscopy", "FileSetMicroscopeQc",
+    "ImagingPath", "ExperimentMic", "ExperimentMic_Path", "ExperimentHiC",
+    "ExperimentCaptureC", "ExperimentRepliseq", "ExperimentAtacseq",
     "ExperimentChiapet", "ExperimentDamid", "ExperimentSeq", "ExperimentSet",
     "ExperimentSetReplicate", "WorkflowRunSbg", "WorkflowRunAwsem", "OntologyTerm"
     ]