Merge branch 'develop' into feature/exposures_hdf5_io

Author: emanuel-schmid

climada/test/test_litpop_integr.py

@@ -53,7 +53,9 @@ def test_netherlands150_pass(self):
         self.assertEqual(ent.gdf.shape[0], 2829)
 
     def test_BLM150_pass(self):
-        """Test from_countries for BLM at 150 arcsec, 2 data points"""
+        """Test from_countries for BLM at 150 arcsec, 2 data points
+        The world bank doesn't provide data for Saint Barthélemy, fall back to natearth
+        """
         ent = lp.LitPop.from_countries("BLM", res_arcsec=150, reference_year=2016)
         self.assertEqual(ent.gdf.shape[0], 2)
 

climada/util/finance.py

@@ -216,7 +216,7 @@ def download_world_bank_indicator(
         # Check if we received an error message
         try:
             if json_data[0]["message"][0]["id"] == "120":
-                raise RuntimeError(
+                raise ValueError(
                     "Error requesting data from the World Bank API. Did you use the "
                     "correct country code and indicator ID?"
                 )

climada/util/test/test_finance.py

@@ -151,12 +151,12 @@ def test_download_wb_data(self):
 
         # Check errors raised
         with self.assertRaisesRegex(
-            RuntimeError,
+            ValueError,
             "Did you use the correct country code",
         ):
             download_world_bank_indicator("Spain", "NY.GDP.MKTP.CD")
         with self.assertRaisesRegex(
-            RuntimeError,
+            ValueError,
             "Did you use the correct country code",
         ):
             download_world_bank_indicator("ESP", "BogusIndicator")

script/jenkins/test_data_api.py

@@ -25,7 +25,6 @@
 
 import numpy as np
 import pytest
-from pandas_datareader import wb
 
 from climada import CONFIG
 from climada.entity.exposures.litpop.nightlight import BM_FILENAMES, download_nl_files
@@ -36,7 +35,11 @@
     download_icon_grib,
 )
 from climada.util.files_handler import download_file, download_ftp
-from climada.util.finance import WORLD_BANK_INC_GRP, WORLD_BANK_WEALTH_ACC
+from climada.util.finance import (
+    WORLD_BANK_INC_GRP,
+    WORLD_BANK_WEALTH_ACC,
+    download_world_bank_indicator,
+)
 
 
 class TestDataAvail(unittest.TestCase):
@@ -75,7 +78,8 @@ def test_wb_lev_hist_pass(self):
 
     def test_wb_api_pass(self):
         """Test World Bank API"""
-        wb.download(indicator="NY.GDP.MKTP.CD", country="CHE", start=1960, end=2030)
+        download_world_bank_indicator(indicator="NY.GDP.MKTP.CD", country_code="CHE")
+        # as this doesn't download to a file, there is nothing to unlink
 
     def test_ne_api_pass(self):
         """Test Natural Earth API"""