Merge branch 'dev' into f-enum

CHANGELOG.md

@@ -68,6 +68,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * #40 Insertion of identifiables with missing obligatory properties
 - Before, a Property with the datatype "LIST(TEXT)" would lead to the creation 
   of a RecordType. This is fixed now.
+* #52 `XLSimporter.read_xls` throwed a wrong error when reading from a file with a wrong ending. 
+  Now, a `DataInconsistencyError` is raised instead of a ValueError.
 
 ### Security ###
 

src/caosadvancedtools/table_importer.py

@@ -195,7 +195,7 @@ class XLSImporter(object):
         """
         try:
             xls_file = pd.io.excel.ExcelFile(filename)
-        except XLRDError as e:
+        except (XLRDError, ValueError) as e:
             logger.warning(
                 "Cannot read \n{}.\nError:{}".format(filename,
                                                      str(e)),

unittests/test_table_importer.py

@@ -174,7 +174,6 @@ class XLSImporterTest(unittest.TestCase):
         df_new = self.importer.check_unique(df)
         self.assertEqual(df_new.shape[0], 1)
 
-    @pytest.mark.xfail(reason="Wrong Error is raised. See Issue #52")
     def test_raise(self):
         tmp = NamedTemporaryFile(delete=False, suffix=".lol")
         tmp.close()