Merge pull request #225 from berland/pandas12

Pandas 1.2.0 compatibility
equinor · Dec 28, 2020 · 4ff1230 · 4ff1230
2 parents 5b99748 + 79ab2b0
commit 4ff1230
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,6 +2,8 @@ repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v3.4.0
   hooks:
+  - id:  no-commit-to-branch
+    args: ['--branch', 'master']
   - id: check-yaml
   - id: debug-statements
   - id: end-of-file-fixer

diff --git a/pyscal/factory.py b/pyscal/factory.py
@@ -1068,13 +1068,15 @@ def infer_tabular_file_format(filename):
     try:
         pd.read_excel(filename, engine="openpyxl")
         return "xlsx"
-    except openpyxl.utils.exceptions.InvalidFileException:
-        # We get here for both CSV and XLS files.
+    except (ValueError, OSError, openpyxl.utils.exceptions.InvalidFileException):
+        # < Pandas 1.2, we get InvalidFileException from openpyxl
+        # >= Pandas 1.2.0: CSV gives ValueError,
+        #                  XLS gives OSError
         pass
     try:
         pd.read_excel(filename, engine="xlrd")
         return "xls"
-    except xlrd.biffh.XLRDError:
+    except (ValueError, xlrd.biffh.XLRDError):
         # We get here for both CSV and XLSX files.
         pass
     try: