Merge pull request #456 from kids-first/analyze-xls

✨ Accept .xls file type for file analysis
kids-first · Aug 25, 2020 · c76d4d4 · c76d4d4
2 parents 21e2d4a + 16bf179
commit c76d4d4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/creator/analyses/analyzer.py b/creator/analyses/analyzer.py
@@ -33,6 +33,7 @@ def CSVDictReader(data, delimiter=","):
         "reader": partial(CSVDictReader, delimiter="\t"),
     },
     ".xlsx": {"name": "Excel", "reader": XLSXDictReader},
+    ".xls": {"name": "Excel", "reader": XLSXDictReader},
 }
 
 NUMBER_OF_COMMON_VALUES = 15

diff --git a/tests/analyses/test_file_formats.py b/tests/analyses/test_file_formats.py
@@ -13,7 +13,12 @@ def test_file_formats(db, clients, upload_file):
     client = clients.get("Administrators")
     study = StudyFactory()
 
-    analyses = {"tsv": None, "csv": None, "xlsx": None}
+    analyses = {
+        "tsv": None,
+        "csv": None,
+        "xlsx": None,
+        "xls": None,
+    }
 
     for fmt in analyses.keys():
         resp = upload_file(
@@ -36,6 +41,7 @@ def test_file_formats(db, clients, upload_file):
             getattr(analyses["csv"], attr)
             == getattr(analyses["tsv"], attr)
             == getattr(analyses["xlsx"], attr)
+            == getattr(analyses["xls"], attr)
         )
 
 

diff --git a/tests/data/SD_ME0WME0W/FV_4DP2P2Y2_clinical.xls b/tests/data/SD_ME0WME0W/FV_4DP2P2Y2_clinical.xls