Skip to content

Commit 94affe5

Browse files
authored
Merge branch 'master' into osm-raw-islands
2 parents e8106ca + 2eeb507 commit 94affe5

13 files changed

+431
-419
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ test:
8181
snakemake -call solve_elec_networks --configfile config/test/config.electricity.yaml
8282
snakemake -call --configfile config/test/config.overnight.yaml
8383
snakemake -call --configfile config/test/config.myopic.yaml
84-
snakemake -call make_summary_perfect --configfile config/test/config.perfect.yaml
8584
snakemake -call resources/test-elec-clusters/networks/base_s_adm.nc --configfile config/test/config.clusters.yaml
8685
snakemake -call --configfile config/test/config.scenarios.yaml -n
8786
snakemake -call plot_power_networks_clustered --configfile config/test/config.tyndp.yaml

config/plotting.default.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
plotting:
77
map:
88
boundaries: [-11, 30, 34, 71]
9-
color_geomap:
9+
geomap_colors:
1010
ocean: white
1111
land: white
1212
projection:

doc/configtables/plotting.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
,Unit,Values,Description
22
map,,,
33
-- boundaries,°,"[x1,x2,y1,y2]",Boundaries of the map plots in degrees latitude (y) and longitude (x)
4-
-- color_geomap,,,
4+
-- geomap_colors,,,
55
-- -- ocean,--,str,Color of the ocean in the geomap.
66
-- -- land,--,str,Color of the land in the geomap.
77
projection,,,

doc/release_notes.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ Upcoming Release
4646

4747
* Remove pinned environment files mention in the pre-commit-config-yaml (https://github.com/PyPSA/pypsa-eur/pull/1837)
4848

49+
* Increase minimum required `pypsa` version to 0.33.2 (https://github.com/PyPSA/pypsa-eur/pull/1849)
50+
51+
* Running perfect foresight is now marked as unstable and may not work as expected.
52+
4953
PyPSA-Eur v2025.07.0 (11th July 2025)
5054
=====================================
5155

@@ -110,6 +114,9 @@ PyPSA-Eur v2025.07.0 (11th July 2025)
110114
* Small plotting improvements.
111115
(https://github.com/PyPSA/pypsa-eur/pull/1694https://github.com/PyPSA/pypsa-eur/pull/1727)
112116

117+
* The `plotting|map|color_geomap` was renamed to `plotting|map|geomap_colors` to align
118+
with the new PyPSA API.
119+
113120
**Bugfixes and Compatibility**
114121

115122
* Select correct capital costs for floating offshore wind. Previously, the same

envs/environment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- pip
1212

1313
# Inhouse packages
14-
- pypsa>=0.32.1
14+
- pypsa>=0.35.2
1515
- atlite>=0.3
1616
- linopy>=0.4.4
1717
- powerplantmatching>=0.5.15

0 commit comments

Comments
 (0)