white space comsmetics

Author: emanuel-schmid

climada/test/__init__.py

@@ -52,7 +52,7 @@ def get_test_file(ds_name, file_format=None):
     ) if ds.version.strip('v') <= climada_version.strip('v')][-1]
     _, files = client.download_dataset(test_ds)
     [test_file] = [fil for fil in files if fil.name in [
-        dsf.file_name 
-        for dsf in test_ds.files 
+        dsf.file_name
+        for dsf in test_ds.files
         if file_format is None or dsf.file_format == file_format]]
     return test_file

climada/test/test_api_client.py

@@ -253,12 +253,12 @@ def test_multiplicity_split(self):
 
     def test_purge_cache(self):
         client = Client()
-        
+
         active_ds = client.get_dataset_info(data_type="litpop", name="LitPop_150arcsec_ABW", version="v2")
         outdated_ds = client.get_dataset_info(data_type="litpop", name="LitPop_150arcsec_ABW", version="v1")
         test_ds = client.get_dataset_info(data_type="storm_europe", name="test_storm_europe_icon_2021012800", version="v1", status="test_dataset")
         expired_ds = client.get_dataset_info(data_type="tropical_cyclone", name="rename_files2", version="v1", status="expired")
-        
+
         with tempfile.TemporaryDirectory() as temp_dir:
             for ds in [active_ds, outdated_ds, test_ds, expired_ds]:
                 client.download_dataset(dataset=ds, target_dir=Path(temp_dir))

climada/test/test_litpop_integr.py

@@ -144,7 +144,7 @@ def test_from_shape_zurich_pass(self):
     def test_from_shape_and_countries_zurich_pass(self):
         """test initiating LitPop for custom shape (square around Zurich City)
         with from_shape_and_countries()"""
-        
+
         ent = lp.LitPop.from_shape_and_countries(
             shape, 'Switzerland', res_arcsec=30, reference_year=2016)
         self.assertEqual(ent.gdf.value.min(), 0.0)
@@ -181,7 +181,7 @@ def test_Liechtenstein_30_pop_pass(self):
         self.assertAlmostEqual(ent.meta['transform'][0], 30/3600)
 
     def test_from_nightlight_intensity(self):
-        """ Test raises, logger and if methods from_countries and from_shape are 
+        """ Test raises, logger and if methods from_countries and from_shape are
             are used."""
 
         with self.assertRaises(ValueError) as cm:
@@ -191,34 +191,35 @@ def test_from_nightlight_intensity(self):
         with self.assertRaises(ValueError) as cm:
             lp.LitPop.from_nightlight_intensity(countries = 'Liechtenstein', shape = shape)
         self.assertEqual('Not allowed to set both `countries` and `shape`. Aborting.', str(cm.exception))
-        
-        exp = lp.LitPop.from_nightlight_intensity(countries = 'Liechtenstein') 
+
+        exp = lp.LitPop.from_nightlight_intensity(countries = 'Liechtenstein')
         self.assertEqual(exp.fin_mode, 'none')
 
-        exp = lp.LitPop.from_nightlight_intensity(shape = shape) 
+        exp = lp.LitPop.from_nightlight_intensity(shape = shape)
         self.assertEqual(exp.value_unit, '')
-        
+
         with self.assertLogs('climada.entity.exposures.litpop.litpop', level = 'WARNING') as cm:
             lp.LitPop.from_nightlight_intensity(shape = shape)
         self.assertIn('Note: set_nightlight_intensity sets values to raw nightlight intensity,', cm.output[0])
 
     def test_from_population(self):
-        """ Test raises, logger and if methods from_countries and from_shape are 
+        """ Test raises, logger and if methods from_countries and from_shape are
             are used."""
 
         with self.assertRaises(ValueError) as cm:
             lp.LitPop.from_population()
         self.assertEqual('Either `countries` or `shape` required. Aborting.', str(cm.exception))
 
-        exp = lp.LitPop.from_population(countries = 'Liechtenstein') 
+        exp = lp.LitPop.from_population(countries = 'Liechtenstein')
         self.assertEqual(exp.fin_mode, 'pop')
 
-        exp = lp.LitPop.from_population(shape = shape) 
+        exp = lp.LitPop.from_population(shape = shape)
         self.assertEqual(exp.value_unit, 'people')
 
         with self.assertRaises(ValueError) as cm:
             lp.LitPop.from_population(countries = 'Liechtenstein', shape = shape)
-        self.assertEqual('Not allowed to set both `countries` and `shape`. Aborting.', str(cm.exception))        
+        self.assertEqual('Not allowed to set both `countries` and `shape`. Aborting.', str(cm.exception))
+
 
 class TestAdmin1(unittest.TestCase):
     """Test the admin1 functionalities within the LitPop module"""
@@ -309,7 +310,7 @@ def test_load_gpw_pop_shape_pass(self):
             self.assertEqual(meta['height'], data.shape[0])
             self.assertEqual(meta['width'], data.shape[1])
             self.assertIsInstance(data, np.ndarray)
-            self.assertEqual(len(data.shape), 2) 
+            self.assertEqual(len(data.shape), 2)
         except FileExistsError as err:
             self.assertIn('lease download', err.args[0])
             self.skipTest('GPW input data for GPW v4.%i not found.' %(gpw_version))

climada/test/test_nightlight.py

@@ -185,7 +185,7 @@ def test_load_nightlight_noaa(self):
             # compressed image to a gzip file
             with gzip.GzipFile(SYSTEM_DIR.joinpath(gzfile), 'wb') as f:
                 f.write(mem.getvalue())
-             
+
         try:
             # with arguments
             night, coord_nl, fn_light = nightlight.load_nightlight_noaa(ref_year=year, sat_name=sat_name)

climada/util/plot.py

@@ -314,7 +314,7 @@ def geo_im_from_array(array_sub, coord, var_name, title,
     if axes is None:
         proj_plot = proj
         if isinstance(proj, ccrs.PlateCarree):
-            # for PlateCarree, center plot around data's central lon 
+            # for PlateCarree, center plot around data's central lon
             # without overwriting the data's original projection info
             xmin, xmax = u_coord.lon_bounds(np.concatenate([c[:, 1] for c in list_coord]))
             proj_plot = ccrs.PlateCarree(central_longitude=0.5 * (xmin + xmax))

climada/util/test/test_config.py

@@ -66,7 +66,7 @@ def test_missing(self):
             CONFIG.hazard.fire_fly.population.str()
         self.assertIn("there is no 'fire_fly' configured for 'hazard'", str(ve.exception))
         self.assertIn("check your config files: [", str(ve.exception))
-        
+
         with self.assertRaises(AttributeError) as ve:
             CONFIG.some_module.str()
         self.assertIn("there is no 'some_module' configured for 'climada.CONFIG'", str(ve.exception))

climada/util/test/test_yearsets.py

@@ -65,7 +65,7 @@ def test_sample_from_poisson(self):
 
             self.assertEqual(events_per_year.size, n_sample_years)
             self.assertAlmostEqual(np.mean(events_per_year), lam, places=1)
-        
+
         self.assertRaises(TypeError, yearsets.sample_from_poisson, n_sample_years, None)
         self.assertRaises(ValueError, yearsets.sample_from_poisson, n_sample_years, -1)