Merge branch 'develop' into cross-calibrate-impact-functions

Author: emanuel-schmid

.github/scripts/prepare_release.py

@@ -3,7 +3,7 @@
 
 The following preparation steps are executed:
 
-- update version numbers in _version.py and setup.py
+- update version numbers in _version.py and pyproject.toml
 - purge the "Unreleased" section of CHANGELOG.md and rename it to the new version number
 
 All changes are immediately commited to the repository.
@@ -117,10 +117,10 @@ def update_version(nvn):
     return update_file(file_with_version, regex, nvn)
 
 
-def update_setup(new_version_number):
-    """Update the setup.py file"""
-    file_with_version = "setup.py"
-    regex = r"(^\s+version\s*=\s*[\'\"]).*([\'\"]\s*,\s*$)"
+def update_pyproject(new_version_number):
+    """Update the pyproject.toml file"""
+    file_with_version = "pyproject.toml"
+    regex = r"(^version\s*=\s*[\'\"]).*([\'\"]\s*$)"
     return update_file(file_with_version, regex, new_version_number)
 
 
@@ -211,7 +211,7 @@ def prepare_new_release(level):
             raise
     new_version_number = bump_version_number(last_version_number, level)
 
-    update_setup(new_version_number).gitadd()
+    update_pyproject(new_version_number).gitadd()
     update_version(new_version_number).gitadd()
     update_changelog(new_version_number).gitadd()
 

.github/scripts/setup_devbranch.py

@@ -3,7 +3,7 @@
 
 The following preparation steps are executed:
 
-- update version numbers in _version.py and setup.py: append a -dev suffix
+- update version numbers in _version.py and pyproject.toml: append a -dev suffix
 - insert a vanilla "unreleased" section on top of CHANGELOG.md
 
 The changes are not commited to the repository. This is dealt with in the bash script
@@ -75,10 +75,10 @@ def update_version(nvn):
     return update_file(file_with_version, regex, nvn)
 
 
-def update_setup(new_version_number):
-    """Update the setup.py file"""
-    file_with_version = "setup.py"
-    regex = r"(^\s+version\s*=\s*[\'\"]).*([\'\"]\s*,\s*$)"
+def update_pyproject(new_version_number):
+    """Update the pyproject.toml file"""
+    file_with_version = "pyproject.toml"
+    regex = r"(^version\s*=\s*[\'\"]).*([\'\"]\s*$)"
     return update_file(file_with_version, regex, new_version_number)
 
 
@@ -110,7 +110,7 @@ def setup_devbranch():
     semver[-1] = f"{int(semver[-1]) + 1}-dev"
     dev_version = ".".join(semver)
 
-    update_setup(dev_version)
+    update_pyproject(dev_version)
     update_version(dev_version)
     update_changelog()
 

.github/scripts/setup_devbranch.sh

@@ -10,14 +10,14 @@ git checkout develop
 git pull
 
 git checkout origin/main \
-    setup.py \
+    pyproject.toml \
     CHANGELOG.md \
     */_version.py
 
 release=`python .github/scripts/setup_devbranch.py`
 
 git add \
-    setup.py \
+    pyproject.toml \
     CHANGELOG.md \
     */_version.py
 

.github/workflows/make-release.yml

@@ -1,7 +1,7 @@
 # This workflow will create a new release from main
 
 # the new version number is the old one increased by 1 in the given level [major, minor, patch]
-# first, some files are modified (_version.py, setup.py and CHANGELOG.md
+# first, some files are modified (_version.py, pyproject.toml and CHANGELOG.md
 # then, a new release is created on GitHub, tagged with v[new version number]
 
 name: Create a new release

.github/workflows/postrelease-setup-devbranch.yml

@@ -1,6 +1,6 @@
 # This workflow will re-initialize the develop branch after a release was published
 
-# the version number of setup.py and _version.py will be taken from main, but have a "-dev" appendix
+# the version number of pyproject.toml and _version.py will be taken from main, but have a "-dev" appendix
 # the CHANGELOG.md file will be updated and have a vanila "Unreleased" section
 
 name: Post-release develop setup

CHANGELOG.md

@@ -31,8 +31,10 @@ Removed:
 - Added util methods to handle crs coordinates consistently: `is_geo_coords`, `check_if_geo_coords`, `get_crs_unit`, `estimate_matching_threshold`, `degree_to_km`, and `km_to_degree` [#1080](https://github.com/CLIMADA-project/climada_python/pull/1080)
 - `ImpactFunc` and `ImpactFuncSet` now support equality comparisons via `==` [#1027](https://github.com/CLIMADA-project/climada_python/pull/1027)
 - Calibration of impact function ensembles in `climada.util.calibrate` [#1048](https://github.com/CLIMADA-project/climada_python/pull/1048)
+- Added optional `attrs` parameter to `Exposures.from_raster` method to set additional object properties through the method's `Exposures.__init__` call.
 
 ### Changed
+
 - Changed default distance threshold for nearest neighbor matching in `util.coordinates.match_coordinates` from a fixed value of 100km to twice the highest resolution of the coords_to_assign [#1080](https://github.com/CLIMADA-project/climada_python/pull/1080).
 - Changed the default mask_distance in `util.plot.geo_im_from_array` to 0.03 to avoid white gaps in gridded hazard data with comparably low resolution (>80 centroids per axis) [#1073](https://github.com/CLIMADA-project/climada_python/pull/1073)
 - Increased speed of `util.plot.add_shapes` by avoiding for loops, substantially speeding up `Hazard.plot_intensity` and other functions. [#1073](https://github.com/CLIMADA-project/climada_python/pull/1073)
@@ -47,6 +49,7 @@ geographic coordinates as input (e.g. `util.coordinates.dist_to_coast`, `util.co
 - `Input` to impact function calibration tasks now supports adding weights to the data [#1048](https://github.com/CLIMADA-project/climada_python/pull/1048)
 - Add `climada.hazard.xarray` module with helper structures for reading Hazard objects from `xarray` data [#1063](https://github.com/CLIMADA-project/climada_python/pull/1063)
 - The output of the `impact_yearset` was changed to only contain attributes corresponding to the yearly impact set. The application of the correction factor and the frequency of the resulting yearly impact object are corrected. [#1075](https://github.com/CLIMADA-project/climada_python/pull/1075)
+- `util.coordinates.get_resolution` always returns positive values, regardless of how the input coordinates' order [#1080](https://github.com/CLIMADA-project/climada_python/pull/1080).
 
 ### Fixed
 

climada/engine/unsequa/calc_base.py

@@ -605,7 +605,7 @@ def _calc_sens_df(method, problem_sa, sensitivity_kwargs, param_labels, X, unc_d
         ).ravel()
         sens_second_order_dict[submetric_name] = sens_second_order
 
-    sens_first_order_df = pd.DataFrame(sens_first_order_dict, dtype=np.number)
+    sens_first_order_df = pd.DataFrame(sens_first_order_dict, dtype=float)
 
     if not sens_first_order_df.empty:
         si_names_first_order, param_names_first_order = _si_param_first(

climada/entity/exposures/base.py

@@ -723,6 +723,7 @@ def from_raster(
         width=None,
         height=None,
         resampling=Resampling.nearest,
+        attrs=None,
     ):
         """Read raster data and set latitude, longitude, value and meta
 
@@ -750,11 +751,15 @@ def from_raster(
         resampling : rasterio.warp,.Resampling optional
             resampling
             function used for reprojection to dst_crs
+        attrs : dict
+            dictionary of kwargs passed to the resulting Exposures.__init__
 
         returns
         --------
         Exposures
         """
+        attrs = attrs or {}
+
         meta, value = u_coord.read_raster(
             file_name,
             [band],
@@ -781,6 +786,7 @@ def from_raster(
             },
             meta=meta,
             crs=meta["crs"],
+            **attrs,
         )
 
     def plot_scatter(

climada/entity/exposures/litpop/gpw_population.py

@@ -23,6 +23,7 @@
 
 import numpy as np
 import rasterio
+from affine import Affine
 
 from climada import CONFIG
 from climada.util.constants import SYSTEM_DIR
@@ -171,3 +172,53 @@ def get_gpw_file_path(gpw_version, reference_year, data_dir=None, verbose=True):
         f" different folder. The data can be downloaded from {sedac_browse_url}, e.g.,"
         f" {sedac_file_url} (Free NASA Earthdata login required)."
     )
+
+
+def grid_aligned_with_gpw(reference_year, gpw_version, res_arcsec, data_dir=SYSTEM_DIR):
+    """
+    Defines a grid based on population metadata.
+
+    Parameters
+    ----------
+    reference_year : int
+        The reference year for population and nightlight data.
+    gpw_version : int
+        Version number of GPW population data.
+    res_arcsec : int or None
+        Desired resolution in arcseconds. If None, aligns to population grid.
+    data_dir : str
+        Path to input data directory.
+
+    Returns
+    -------
+    grid : dict
+        A dictionary containing grid metadata, following the raster grid
+        specification.
+    """
+    res_deg = res_arcsec / 3600
+
+    file_path = get_gpw_file_path(
+        gpw_version, reference_year, data_dir=data_dir, verbose=False
+    )
+    with rasterio.open(file_path, "r") as src:
+        global_crs = src.crs
+        gpw_transform = src.transform
+    # Align grid resolution with GPW dataset
+    aligned_lon_min = -180 + (round((gpw_transform[2] - (-180)) / res_deg) * res_deg)
+    aligned_lat_max = 90 - (round((90 - gpw_transform[5]) / res_deg) * res_deg)
+
+    global_transform = Affine(res_deg, 0, aligned_lon_min, 0, -res_deg, aligned_lat_max)
+
+    global_width = round(360 / res_deg)
+    global_height = round(180 / res_deg)
+
+    # Define the target grid using the computed values
+    return {
+        "driver": "GTiff",
+        "dtype": "float32",
+        "nodata": None,
+        "crs": global_crs,
+        "width": global_width,
+        "height": global_height,
+        "transform": global_transform,
+    }