Skip to content

Remove Python 3.8 compat in .macro.extrapolate() #960

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
khaeru merged 1 commit into from
Jul 3, 2025
+1 −6
Merged

Remove Python 3.8 compat in .macro.extrapolate() #960

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
7 changes: 1 addition & 6 deletions message_ix/macro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,6 @@ def extrapolate(
The index does *not* have a ``year`` dimension; the data are implicitly for
`ym1`.
"""
from sys import version_info

from scipy.optimize import curve_fit

def f(x, b, m):
Expand All @@ -278,11 +276,8 @@ def fitted_intercept(df: pd.DataFrame) -> float:

# Apply fitted_intercept to grouped data
groupby_cols = set(model_data.columns) - {"year", "value"}
apply_kwargs = {"include_groups": False} if version_info.minor > 8 else {}
result = (
model_data.groupby(list(groupby_cols))
.apply(fitted_intercept, **apply_kwargs)
.rename("value")
model_data.groupby(list(groupby_cols)).apply(fitted_intercept).rename("value")
)

# Convert "commodity" and "level" to "sector"
Expand Down