Skip to content

Commit 1da76dd

Browse files
fneumpre-commit-ci[bot]
fneum
and
pre-commit-ci[bot]
authored
prepare release v0.11.0 (#1081)
* prepare release notes v0.11.0 * streamline release notes * update envs/environment.fixed.yaml * doc: update workflow DAGs * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * pre-commit formatting [no ci] * update envs/environment.fixed.yaml * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 7ad930e commit 1da76dd

File tree

8 files changed

+1430
-1124
lines changed

8 files changed

+1430
-1124
lines changed

‎CITATION.cff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cff-version: 1.1.0
66
message: "If you use this package, please cite it in the following way."
77
title: "PyPSA-Eur: An open sector-coupled optimisation model of the European energy system"
88
repository: https://github.com/pypsa/pypsa-eur
9-
version: 0.10.0
9+
version: 0.11.0
1010
license: MIT
1111
authors:
1212
- family-names: Brown

‎config/config.default.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: CC0-1.0
44

55
# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#top-level-configuration
6-
version: 0.10.0
6+
version: 0.11.0
77
tutorial: false
88

99
logging:

‎doc/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@
9393
# built documents.
9494
#
9595
# The short X.Y version.
96-
version = "0.10"
96+
version = "0.11"
9797
# The full version, including alpha/beta/rc tags.
98-
release = "0.10.0"
98+
release = "0.11.0"
9999

100100
# The language for content autogenerated by Sphinx. Refer to documentation
101101
# for a list of supported languages.

‎doc/img/intro-workflow.png‎

15.2 KB
Loading

‎doc/release_notes.rst‎

Lines changed: 285 additions & 253 deletions
Large diffs are not rendered by default.

‎doc/tutorial.rst‎

Lines changed: 57 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -132,47 +132,51 @@ This triggers a workflow of multiple preceding jobs that depend on each rule's i
132132
graph[bgcolor=white, margin=0];
133133
node[shape=box, style=rounded, fontname=sans, fontsize=10, penwidth=2];
134134
edge[penwidth=2, color=grey];
135-
0[label = "solve_network", color = "0.38 0.6 0.85", style="rounded"];
136-
1[label = "prepare_network\nll: copt", color = "0.53 0.6 0.85", style="rounded"];
137-
2[label = "add_extra_components", color = "0.01 0.6 0.85", style="rounded"];
138-
3[label = "cluster_network\nclusters: 6", color = "0.03 0.6 0.85", style="rounded"];
139-
4[label = "simplify_network\nsimpl: ", color = "0.42 0.6 0.85", style="rounded"];
140-
5[label = "add_electricity", color = "0.10 0.6 0.85", style="rounded"];
141-
6[label = "build_renewable_profiles\ntechnology: solar", color = "0.50 0.6 0.85", style="rounded"];
142-
7[label = "base_network", color = "0.22 0.6 0.85", style="rounded"];
143-
8[label = "build_shapes", color = "0.44 0.6 0.85", style="rounded"];
144-
9[label = "retrieve_databundle", color = "0.29 0.6 0.85", style="rounded"];
145-
10[label = "retrieve_cutout\ncutout: be-03-2013-era5", color = "0.49 0.6 0.85", style="rounded"];
146-
11[label = "build_renewable_profiles\ntechnology: onwind", color = "0.50 0.6 0.85", style="rounded"];
147-
12[label = "build_renewable_profiles\ntechnology: offwind-ac", color = "0.50 0.6 0.85", style="rounded"];
148-
13[label = "build_ship_raster", color = "0.19 0.6 0.85", style="rounded"];
149-
14[label = "retrieve_ship_raster", color = "0.35 0.6 0.85", style="rounded"];
150-
15[label = "build_renewable_profiles\ntechnology: offwind-dc", color = "0.50 0.6 0.85", style="rounded"];
151-
16[label = "build_line_rating", color = "0.60 0.6 0.85", style="rounded"];
152-
17[label = "retrieve_cost_data\nyear: 2030", color = "0.59 0.6 0.85", style="rounded"];
153-
18[label = "build_powerplants", color = "0.06 0.6 0.85", style="rounded"];
154-
19[label = "build_electricity_demand", color = "0.13 0.6 0.85", style="rounded"];
155-
20[label = "retrieve_electricity_demand", color = "0.49 0.6 0.85", style="rounded"];
156-
21[label = "retrieve_synthetic_electricity_demand", color = "0.41 0.6 0.85", style="rounded"];
135+
0[label = "solve_network", color = "0.21 0.6 0.85", style="rounded"];
136+
1[label = "prepare_network\nll: copt\nopts: ", color = "0.51 0.6 0.85", style="rounded"];
137+
2[label = "add_extra_components", color = "0.43 0.6 0.85", style="rounded"];
138+
3[label = "cluster_network\nclusters: 6", color = "0.17 0.6 0.85", style="rounded"];
139+
4[label = "simplify_network\nsimpl: ", color = "0.49 0.6 0.85", style="rounded"];
140+
5[label = "add_electricity", color = "0.26 0.6 0.85", style="rounded"];
141+
6[label = "build_renewable_profiles\ntechnology: solar", color = "0.02 0.6 0.85", style="rounded"];
142+
7[label = "base_network", color = "0.35 0.6 0.85", style="rounded"];
143+
8[label = "build_shapes", color = "0.62 0.6 0.85", style="rounded"];
144+
9[label = "retrieve_databundle", color = "0.24 0.6 0.85", style="rounded"];
145+
10[label = "retrieve_cutout\ncutout: be-03-2013-era5", color = "0.36 0.6 0.85", style="rounded"];
146+
11[label = "build_renewable_profiles\ntechnology: solar-hsat", color = "0.02 0.6 0.85", style="rounded"];
147+
12[label = "build_renewable_profiles\ntechnology: onwind", color = "0.02 0.6 0.85", style="rounded"];
148+
13[label = "build_renewable_profiles\ntechnology: offwind-ac", color = "0.02 0.6 0.85", style="rounded"];
149+
14[label = "build_ship_raster", color = "0.08 0.6 0.85", style="rounded"];
150+
15[label = "retrieve_ship_raster", color = "0.28 0.6 0.85", style="rounded"];
151+
16[label = "build_renewable_profiles\ntechnology: offwind-dc", color = "0.02 0.6 0.85", style="rounded"];
152+
17[label = "build_renewable_profiles\ntechnology: offwind-float", color = "0.02 0.6 0.85", style="rounded"];
153+
18[label = "build_line_rating", color = "0.07 0.6 0.85", style="rounded"];
154+
19[label = "retrieve_cost_data\nyear: 2030", color = "0.47 0.6 0.85", style="rounded"];
155+
20[label = "build_powerplants", color = "0.11 0.6 0.85", style="rounded"];
156+
21[label = "build_electricity_demand", color = "0.05 0.6 0.85", style="rounded"];
157+
22[label = "retrieve_electricity_demand", color = "0.58 0.6 0.85", style="rounded"];
158+
23[label = "retrieve_synthetic_electricity_demand", color = "0.11 0.6 0.85", style="rounded"];
157159
1 -> 0
158160
2 -> 1
159-
17 -> 1
161+
19 -> 1
160162
3 -> 2
161-
17 -> 2
163+
19 -> 2
162164
4 -> 3
163-
17 -> 3
165+
19 -> 3
164166
5 -> 4
165-
17 -> 4
167+
19 -> 4
166168
7 -> 4
167169
6 -> 5
168170
11 -> 5
169171
12 -> 5
170-
15 -> 5
171-
7 -> 5
172+
13 -> 5
172173
16 -> 5
173174
17 -> 5
175+
7 -> 5
174176
18 -> 5
175177
19 -> 5
178+
20 -> 5
179+
21 -> 5
176180
8 -> 5
177181
7 -> 6
178182
9 -> 6
@@ -186,21 +190,30 @@ This triggers a workflow of multiple preceding jobs that depend on each rule's i
186190
10 -> 11
187191
7 -> 12
188192
9 -> 12
189-
13 -> 12
190193
8 -> 12
191194
10 -> 12
195+
7 -> 13
196+
9 -> 13
192197
14 -> 13
198+
8 -> 13
193199
10 -> 13
194-
7 -> 15
195-
9 -> 15
196-
13 -> 15
197-
8 -> 15
198-
10 -> 15
200+
15 -> 14
201+
10 -> 14
199202
7 -> 16
203+
9 -> 16
204+
14 -> 16
205+
8 -> 16
200206
10 -> 16
207+
7 -> 17
208+
9 -> 17
209+
14 -> 17
210+
8 -> 17
211+
10 -> 17
201212
7 -> 18
202-
20 -> 19
203-
21 -> 19
213+
10 -> 18
214+
7 -> 20
215+
22 -> 21
216+
23 -> 21
204217
}
205218

206219
|
@@ -219,7 +232,7 @@ In the terminal, this will show up as a list of jobs to be run:
219232
build_electricity_demand 1
220233
build_line_rating 1
221234
build_powerplants 1
222-
build_renewable_profiles 4
235+
build_renewable_profiles 6
223236
build_shapes 1
224237
build_ship_raster 1
225238
cluster_network 1
@@ -232,7 +245,7 @@ In the terminal, this will show up as a list of jobs to be run:
232245
retrieve_synthetic_electricity_demand 1
233246
simplify_network 1
234247
solve_network 1
235-
total 22
248+
total 24
236249
237250
238251
``snakemake`` then runs these jobs in the correct order.
@@ -241,16 +254,15 @@ A job (here ``simplify_network``) will display its attributes and normally some
241254

242255
.. code:: bash
243256
244-
[Mon Feb 19 17:06:17 2024]
245257
rule simplify_network:
246-
input: resources/test/networks/elec.nc, data/costs_2030.csv, resources/test/regions_onshore.geojson, resources/test/regions_offshore.geojson
247-
output: resources/test/networks/elec_s.nc, resources/test/regions_onshore_elec_s.geojson, resources/test/regions_offshore_elec_s.geojson, resources/test/busmap_elec_s.csv, resources/test/connection_costs_s.csv
248-
log: logs/test-elec/simplify_network/elec_s.log
258+
input: resources/test/networks/elec.nc, resources/test/costs_2030.csv, resources/test/regions_onshore.geojson, resources/test/regions_offshore.geojson
259+
output: resources/test/networks/elec_s.nc, resources/test/regions_onshore_elec_s.geojson, resources/test/regions_offshore_elec_s.geojson, resources/test/busmap_elec_s.csv
260+
log: logs/test/simplify_network/elec_s.log
249261
jobid: 4
250-
benchmark: benchmarks/test-elec/simplify_network/elec_s
251-
reason: Missing output files: resources/test/regions_offshore_elec_s.geojson, resources/test/busmap_elec_s.csv, resources/test/regions_onshore_elec_s.geojson, resources/test/networks/elec_s.nc; Input files updated by another job: resources/test/regions_offshore.geojson, resources/test/networks/elec.nc, resources/test/regions_onshore.geojson, data/costs_2030.csv
262+
benchmark: benchmarks/test/simplify_network/elec_s
263+
reason: Forced execution
252264
wildcards: simpl=
253-
resources: tmpdir=/tmp, mem_mb=12000, mem_mib=11445
265+
resources: tmpdir=<TBD>, mem_mb=12000, mem_mib=11445
254266
255267
Once the whole worktree is finished, it should state so in the terminal.
256268

0 commit comments

Comments
 (0)