diff --git a/pyam/plotting.py b/pyam/plotting.py index b5f739d4f..c7289f8c8 100644 --- a/pyam/plotting.py +++ b/pyam/plotting.py @@ -227,7 +227,7 @@ def assign_style_props(df, color=None, marker=None, linestyle=None, cmap=None): values = list(d.values()) # find if any colors in our properties corresponds with special colors # we know about - overlap_idx = np.in1d(values, list(PYAM_COLORS.keys())) + overlap_idx = np.isin(values, list(PYAM_COLORS.keys())) if overlap_idx.any(): # some exist in our special set keys = np.array(list(d.keys()))[overlap_idx] values = np.array(values)[overlap_idx] diff --git a/pyam/timeseries.py b/pyam/timeseries.py index c499b6003..70a7939d3 100644 --- a/pyam/timeseries.py +++ b/pyam/timeseries.py @@ -130,7 +130,7 @@ def cross_threshold( # it year (as int) is returned, add one because int() rounds down if return_type is int: - return [y + 1 for y in map(int, years)] + return [y + 1 for y in map(int, years.ravel())] return years