Skip to content

Commit 8cf258e

Browse files
build(deps): bump softprops/action-gh-release from 2 to 3 in the github-actions group (#293)
* build(deps): bump softprops/action-gh-release Bumps the github-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2 to 3 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@v2...v3) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: '3' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 58bc759 commit 8cf258e

2 files changed

Lines changed: 23 additions & 14 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
runs-on: ubuntu-latest
140140
steps:
141141
- uses: actions/checkout@v6
142-
- uses: softprops/action-gh-release@v2
142+
- uses: softprops/action-gh-release@v3
143143
with:
144144
body: |
145145
Revised release notes are available in the [documentation](https://${{ github.event.repository.name }}.readthedocs.io/en/latest/release-notes.html).

powerplantmatching/data.py

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,17 +1409,20 @@ def BNETZA(
14091409
regex=True,
14101410
),
14111411
)[
1412-
lambda df: df.projectID.notna()
1413-
& df.Status.str.contains(pattern, regex=True, case=False)
1412+
lambda df: (
1413+
df.projectID.notna()
1414+
& df.Status.str.contains(pattern, regex=True, case=False)
1415+
)
14141416
].pipe(
14151417
gather_specifications,
14161418
search_col=["Name", "Fueltype", "Blockname"],
14171419
config=config,
14181420
)
14191421

14201422
add_location_b = bnetza[bnetza.Ort.notnull()].apply(
1421-
lambda ds: (ds["Ort"] not in ds["Name"])
1422-
and (str.title(ds["Ort"]) not in ds["Name"]),
1423+
lambda ds: (
1424+
(ds["Ort"] not in ds["Name"]) and (str.title(ds["Ort"]) not in ds["Name"])
1425+
),
14231426
axis=1,
14241427
)
14251428
bnetza.loc[bnetza.Ort.notnull() & add_location_b, "Name"] = (
@@ -1808,8 +1811,10 @@ def GNPT(raw=False, update=False, config=None):
18081811
.pipe(convert_to_short_name)
18091812
.dropna(subset="Capacity")
18101813
.assign(
1811-
Name=lambda df: df["Name"]
1812-
+ df["Unit Name"].fillna("").apply(lambda x: f" {x}" if x else ""),
1814+
Name=lambda df: (
1815+
df["Name"]
1816+
+ df["Unit Name"].fillna("").apply(lambda x: f" {x}" if x else "")
1817+
),
18131818
DateIn=df["DateIn"].apply(pd.to_numeric, errors="coerce"),
18141819
DateOut=df["DateOut"].apply(pd.to_numeric, errors="coerce"),
18151820
lat=df["lat"].apply(pd.to_numeric, errors="coerce"),
@@ -1899,8 +1904,10 @@ def GCPT(raw=False, update=False, config=None):
18991904
.pipe(convert_to_short_name)
19001905
.dropna(subset="Capacity")
19011906
.assign(
1902-
Name=lambda df: df["Name"]
1903-
+ df["Unit name"].fillna("").apply(lambda x: f" {x}" if x else ""),
1907+
Name=lambda df: (
1908+
df["Name"]
1909+
+ df["Unit name"].fillna("").apply(lambda x: f" {x}" if x else "")
1910+
),
19041911
DateIn=df["DateIn"].apply(pd.to_numeric, errors="coerce"),
19051912
DateOut=df["DateOut"]
19061913
.apply(pd.to_numeric, errors="coerce")
@@ -2545,11 +2552,13 @@ def MASTR(
25452552
df_processed.loc[mask, "Set"] = "PP"
25462553

25472554
df_processed["Name"] = df_processed.apply(
2548-
lambda x: f"{x.Name} {x.NameKraftwerksblock.replace(x.Name, '').strip()}"
2549-
if x.NameKraftwerksblock
2550-
and x.NameKraftwerksblock != x.Name
2551-
and x.Fueltype in config["clean_name"]["fueltypes_with_blocks"]
2552-
else x.Name,
2555+
lambda x: (
2556+
f"{x.Name} {x.NameKraftwerksblock.replace(x.Name, '').strip()}"
2557+
if x.NameKraftwerksblock
2558+
and x.NameKraftwerksblock != x.Name
2559+
and x.Fueltype in config["clean_name"]["fueltypes_with_blocks"]
2560+
else x.Name
2561+
),
25532562
axis=1,
25542563
)
25552564

0 commit comments

Comments
 (0)