Skip to content

fix: fix compatibility with numpy >=2.4 #1958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fneum merged 1 commit into from
Jan 12, 2026
Merged

fix: fix compatibility with numpy >=2.4 #1958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion scripts/make_cumulative_costs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
import numpy as np
import pandas as pd

try:
from numpy import trapezoid
except ImportError:
# before numpy 2.0
from numpy import trapz as trapezoid

from scripts._helpers import configure_logging, set_scenario_config

idx = pd.IndexSlice
Expand All @@ -34,7 +40,7 @@ def calculate_cumulative_cost(costs, planning_horizons):
for cluster in cumulative_cost.index.get_level_values(level=0).unique():
for sector_opts in cumulative_cost.index.get_level_values(level=1).unique():
cumulative_cost.loc[(cluster, sector_opts, "cumulative cost"), r] = (
np.trapz(
trapezoid(
cumulative_cost.loc[
idx[cluster, sector_opts, planning_horizons], r
].values,
Expand Down
8 changes: 7 additions & 1 deletion scripts/make_summary_perfect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
from pypsa.descriptors import get_active_assets
from six import iteritems

try:
from numpy import trapezoid
except ImportError:
# before numpy 2.0
from numpy import trapz as trapezoid

from scripts._helpers import load_costs, set_scenario_config
from scripts.make_summary import (
assign_carriers,
Expand Down Expand Up @@ -140,7 +146,7 @@ def calculate_cumulative_cost():
for cluster in cumulative_cost.index.get_level_values(level=0).unique():
for sector_opts in cumulative_cost.index.get_level_values(level=1).unique():
cumulative_cost.loc[(cluster, sector_opts, "cumulative cost"), r] = (
np.trapz(
trapezoid(
cumulative_cost.loc[
idx[cluster, sector_opts, planning_horizons], r
].values,
Expand Down
Loading