fix check for being a number (#1089)

Author: emanuel-schmid

climada/entity/exposures/litpop/litpop.py

@@ -19,6 +19,7 @@
 """
 
 import logging
+import numbers
 from pathlib import Path
 
 import geopandas
@@ -820,12 +821,12 @@ def _from_country(
             total_value = _get_total_value_per_country(iso3a, fin_mode, reference_year)
 
         # disaggregate total value proportional to LitPop values:
-        if isinstance(total_value, (float, int)):
+        if isinstance(total_value, numbers.Number):
             litpop_gdf["value"] = (
                 np.divide(litpop_gdf["value"], litpop_gdf["value"].sum()) * total_value
             )
         elif total_value is not None:
-            raise TypeError("total_value must be int or float.")
+            raise TypeError(f"total_value ({total_value}) must be a number.")
 
         exp = LitPop()
         exp.set_gdf(litpop_gdf)

climada/util/test/test_files.py

@@ -22,7 +22,12 @@
 import unittest
 from pathlib import Path
 
-from climada.util.constants import DEMO_DIR, ENT_TEMPLATE_XLS, GLB_CENTROIDS_MAT
+from climada.util.constants import (
+    DEMO_DIR,
+    ENT_TEMPLATE_XLS,
+    GLB_CENTROIDS_MAT,
+    SYSTEM_DIR,
+)
 from climada.util.files_handler import (
     download_file,
     get_extension,
@@ -107,7 +112,8 @@ def test_folder_contents(self):
     def test_wrong_argument(self):
         """If the input contains a non-existing file, an empyt directory or a pattern that is not
         matched, the method should raise a ValueError."""
-        empty_dir = DEMO_DIR.parent
+        empty_dir = SYSTEM_DIR / "exposures"
+        self.assertTrue(empty_dir.is_dir)
         with self.assertRaises(ValueError) as ve:
             get_file_names(str(empty_dir))
         self.assertIn("no files", str(ve.exception))