Merge pull request #705 from girder/703-fix-svg-download

Fix SVG downloads not triggering
girder · Jan 28, 2021 · 1adebc1f98158520a9c5127e1af6cf46c622b33c · 1adebc1
2 parents 45f14d8 + 07028fc
commit 1adebc1f98158520a9c5127e1af6cf46c622b33c
Unified Split

Showing with 7 additions and 2 deletions.

+1 −1 setup.py

+5 −1 viime/views.py

+1 −0 web/src/components/vis/VisTileLarge.vue
diff --git a/setup.py b/setup.py
@@ -44,7 +44,7 @@ def list_files_recursive(relpath):
         'sqlalchemy-utils',
         'webargs >=5.5.3, <6',
         'Werkzeug>=0.15',
-        'xlrd>= 1.0.0'
+        'openpyxl'
     ],
     extras_require={
         'memcached': ['pylibmc'],

diff --git a/viime/views.py b/viime/views.py
@@ -95,7 +95,11 @@ def upload_csv_file(file: FileStorage, meta: Dict[str, Any]):
     'meta': JSONDictStr(missing={})
 })
 def upload_excel_file(file: FileStorage, meta: Dict[str, Any]):
-    excel_sheets: Dict[str, pandas.DataFrame] = pandas.read_excel(file, sheet_name=None)
+    excel_sheets: Dict[str, pandas.DataFrame] = pandas.read_excel(
+        file,
+        sheet_name=None,
+        engine='openpyxl',
+    )
     excel_sheets = {sheet: data for (sheet, data) in excel_sheets.items() if not data.empty}
 
     basename = PurePath(cast(str, file.filename)).with_suffix('')

diff --git a/web/src/components/vis/VisTileLarge.vue b/web/src/components/vis/VisTileLarge.vue
@@ -52,6 +52,7 @@ export default defineComponent({
       }
     }
     return {
+      el,
       hasControls,
       helpText,
       downloadImage,