Skip to content

Commit 0ee924b

Browse files
authored
Bump powerplantmatching version to 0.8.0 (pypsa-meets-earth#1702)
* bump powerplantmatching * bump ppl-only pinned version * Bump powerplantmatching to 0.8.0 * improve powerplantmatching filter
1 parent 0ff32da commit 0ee924b

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

config.default.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ electricity:
210210
Store: [battery, H2]
211211
Link: [] # H2 pipeline
212212

213-
powerplants_filter: (DateOut >= 2022 or DateOut != DateOut)
213+
powerplants_filter: (DateOut >= 2022 or DateOut != DateOut) and (DateIn <= 2023 or DateIn != DateIn)
214214
custom_powerplants: false # "false" use only powerplantmatching (ppm) data, "merge" combines ppm and custom powerplants, "replace" use only custom powerplants
215215

216216
conventional_carriers: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]

doc/release_notes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ This part of documentation collects descriptive release notes to capture the mai
1717

1818
**Minor Changes and bug-fixing**
1919

20-
*
20+
* Bump powerplantmatching to 0.8.0 `PR #1699 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1702>`__
2121

22-
PyPSA-Earth 0.7.0
22+
PyPSA-Earth 0.8.0
2323
=================
2424

2525
**New Features and Major Changes**

envs/environment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- pypsa>=0.25.1, <=0.30.3
1515
- atlite>=0.4.1
1616
- dask
17-
- powerplantmatching>=0.5.19 # due to this https://github.com/PyPSA/powerplantmatching/pull/202
17+
- powerplantmatching>=0.8
1818
- earth-osm>=2.3.post1
1919

2020
# Dependencies of the workflow itself

envs/linux-64.lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ dependencies:
384384
- ply=3.11=pyhd8ed1ab_3
385385
- polars=1.32.2=default_h9d415db_0
386386
- polars-default=1.32.2=py39hf521cc8_0
387-
- powerplantmatching=0.7.1=pyhd8ed1ab_0
387+
- powerplantmatching=0.8.0=pyhd8ed1ab_0
388388
- pre-commit=4.3.0=pyha770c72_0
389389
- progressbar2=4.5.0=pyhd8ed1ab_1
390390
- proj=9.6.2=h18fbb6c_2

envs/osx-64.lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ dependencies:
349349
- ply=3.11=pyhd8ed1ab_3
350350
- polars=1.32.2=default_hc55c1fa_0
351351
- polars-default=1.32.2=py39hbd2d40b_0
352-
- powerplantmatching=0.7.1=pyhd8ed1ab_0
352+
- powerplantmatching=0.8.0=pyhd8ed1ab_0
353353
- pre-commit=4.3.0=pyha770c72_0
354354
- progressbar2=4.5.0=pyhd8ed1ab_1
355355
- proj=9.6.2=h8462e38_2

envs/osx-arm64.lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ dependencies:
349349
- ply=3.11=pyhd8ed1ab_3
350350
- polars=1.32.2=default_h931d351_0
351351
- polars-default=1.32.2=py39h31c57e4_0
352-
- powerplantmatching=0.7.1=pyhd8ed1ab_0
352+
- powerplantmatching=0.8.0=pyhd8ed1ab_0
353353
- pre-commit=4.3.0=pyha770c72_0
354354
- progressbar2=4.5.0=pyhd8ed1ab_1
355355
- proj=9.6.2=hdbeaa80_2

envs/win-64.lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ dependencies:
319319
- ply=3.11=pyhd8ed1ab_3
320320
- polars=1.32.2=default_hdbf31e6_0
321321
- polars-default=1.32.2=py39he906d20_0
322-
- powerplantmatching=0.7.1=pyhd8ed1ab_0
322+
- powerplantmatching=0.8.0=pyhd8ed1ab_0
323323
- pre-commit=4.3.0=pyha770c72_0
324324
- progressbar2=4.5.0=pyhd8ed1ab_1
325325
- proj=9.6.2=h7990399_2

0 commit comments

Comments
 (0)