Skip to content

Commit 0c3d74e

Browse files
GbotemiBGbotemiB
authored
Merge branch 'pypsa-meets-earth:main' into development
2 parents 6fa7762 + 7885c0c commit 0c3d74e

File tree

4 files changed

+55
-37
lines changed

4 files changed

+55
-37
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ repos:
5252
# types: [python]
5353

5454
- repo: https://github.com/keewis/blackdoc
55-
rev: v0.4.4
55+
rev: v0.4.5
5656
hooks:
5757
- id: blackdoc
5858

@@ -98,6 +98,6 @@ repos:
9898

9999
# Check for FSFE REUSE compliance (licensing)
100100
- repo: https://github.com/fsfe/reuse-tool
101-
rev: v6.1.2
101+
rev: v6.2.0
102102
hooks:
103103
- id: reuse

‎README.md‎

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -363,15 +363,22 @@ Once OSM data is obtained, Earth-OSM processes it through several stages:
363363
<sub><b>Tooblippe</b></sub>
364364
</a>
365365
</td>
366+
<td align="center">
367+
<a href="https://github.com/cpschau">
368+
<img src="https://avatars.githubusercontent.com/u/124347782?v=4" width="100;" alt="cpschau"/>
369+
<br />
370+
<sub><b>cpschau</b></sub>
371+
</a>
372+
</td>
373+
</tr>
374+
<tr>
366375
<td align="center">
367376
<a href="https://github.com/arizeosalac">
368377
<img src="https://avatars.githubusercontent.com/u/177637669?v=4" width="100;" alt="arizeosalac"/>
369378
<br />
370379
<sub><b>arizeosalac</b></sub>
371380
</a>
372381
</td>
373-
</tr>
374-
<tr>
375382
<td align="center">
376383
<a href="https://github.com/SermishaNarayana">
377384
<img src="https://avatars.githubusercontent.com/u/156903227?v=4" width="100;" alt="SermishaNarayana"/>
@@ -380,24 +387,24 @@ Once OSM data is obtained, Earth-OSM processes it through several stages:
380387
</a>
381388
</td>
382389
<td align="center">
383-
<a href="https://github.com/cpschau">
384-
<img src="https://avatars.githubusercontent.com/u/124347782?v=4" width="100;" alt="cpschau"/>
390+
<a href="https://github.com/AlexanderMeisinger">
391+
<img src="https://avatars.githubusercontent.com/u/91368938?v=4" width="100;" alt="AlexanderMeisinger"/>
385392
<br />
386-
<sub><b>cpschau</b></sub>
393+
<sub><b>AlexanderMeisinger</b></sub>
387394
</a>
388395
</td>
389396
<td align="center">
390-
<a href="https://github.com/gianvicolux">
391-
<img src="https://avatars.githubusercontent.com/u/123154558?v=4" width="100;" alt="gianvicolux"/>
397+
<a href="https://github.com/asolavi">
398+
<img src="https://avatars.githubusercontent.com/u/131155817?v=4" width="100;" alt="asolavi"/>
392399
<br />
393-
<sub><b>gianvicolux</b></sub>
400+
<sub><b>asolavi</b></sub>
394401
</a>
395402
</td>
396403
<td align="center">
397-
<a href="https://github.com/choiHenry">
398-
<img src="https://avatars.githubusercontent.com/u/51810088?v=4" width="100;" alt="choiHenry"/>
404+
<a href="https://github.com/rajesh-ieg">
405+
<img src="https://avatars.githubusercontent.com/u/120284682?v=4" width="100;" alt="rajesh-ieg"/>
399406
<br />
400-
<sub><b>choiHenry</b></sub>
407+
<sub><b>rajesh-ieg</b></sub>
401408
</a>
402409
</td>
403410
<td align="center">
@@ -407,27 +414,27 @@ Once OSM data is obtained, Earth-OSM processes it through several stages:
407414
<sub><b>LucieRC</b></sub>
408415
</a>
409416
</td>
417+
</tr>
418+
<tr>
410419
<td align="center">
411-
<a href="https://github.com/carlosfv92">
412-
<img src="https://avatars.githubusercontent.com/u/103258059?v=4" width="100;" alt="carlosfv92"/>
420+
<a href="https://github.com/choiHenry">
421+
<img src="https://avatars.githubusercontent.com/u/51810088?v=4" width="100;" alt="choiHenry"/>
413422
<br />
414-
<sub><b>carlosfv92</b></sub>
423+
<sub><b>choiHenry</b></sub>
415424
</a>
416425
</td>
417-
</tr>
418-
<tr>
419426
<td align="center">
420-
<a href="https://github.com/rajesh-ieg">
421-
<img src="https://avatars.githubusercontent.com/u/120284682?v=4" width="100;" alt="rajesh-ieg"/>
427+
<a href="https://github.com/gianvicolux">
428+
<img src="https://avatars.githubusercontent.com/u/123154558?v=4" width="100;" alt="gianvicolux"/>
422429
<br />
423-
<sub><b>rajesh-ieg</b></sub>
430+
<sub><b>gianvicolux</b></sub>
424431
</a>
425432
</td>
426433
<td align="center">
427-
<a href="https://github.com/asolavi">
428-
<img src="https://avatars.githubusercontent.com/u/131155817?v=4" width="100;" alt="asolavi"/>
434+
<a href="https://github.com/carlosfv92">
435+
<img src="https://avatars.githubusercontent.com/u/103258059?v=4" width="100;" alt="carlosfv92"/>
429436
<br />
430-
<sub><b>asolavi</b></sub>
437+
<sub><b>carlosfv92</b></sub>
431438
</a>
432439
</td>
433440
<td align="center">
@@ -451,15 +458,15 @@ Once OSM data is obtained, Earth-OSM processes it through several stages:
451458
<sub><b>juli-a-ko</b></sub>
452459
</a>
453460
</td>
461+
</tr>
462+
<tr>
454463
<td align="center">
455464
<a href="https://github.com/squoilin">
456465
<img src="https://avatars.githubusercontent.com/u/4547840?v=4" width="100;" alt="squoilin"/>
457466
<br />
458467
<sub><b>squoilin</b></sub>
459468
</a>
460469
</td>
461-
</tr>
462-
<tr>
463470
<td align="center">
464471
<a href="https://github.com/siddharth-krishna">
465472
<img src="https://avatars.githubusercontent.com/u/10712637?v=4" width="100;" alt="siddharth-krishna"/>
@@ -495,15 +502,15 @@ Once OSM data is obtained, Earth-OSM processes it through several stages:
495502
<sub><b>milyas009</b></sub>
496503
</a>
497504
</td>
505+
</tr>
506+
<tr>
498507
<td align="center">
499508
<a href="https://github.com/kma33">
500509
<img src="https://avatars.githubusercontent.com/u/25573938?v=4" width="100;" alt="kma33"/>
501510
<br />
502511
<sub><b>kma33</b></sub>
503512
</a>
504513
</td>
505-
</tr>
506-
<tr>
507514
<td align="center">
508515
<a href="https://github.com/jome1">
509516
<img src="https://avatars.githubusercontent.com/u/49280197?v=4" width="100;" alt="jome1"/>
@@ -532,6 +539,15 @@ Once OSM data is obtained, Earth-OSM processes it through several stages:
532539
<sub><b>HanaElattar</b></sub>
533540
</a>
534541
</td>
542+
<td align="center">
543+
<a href="https://github.com/Vamsipriya22">
544+
<img src="https://avatars.githubusercontent.com/u/188459113?v=4" width="100;" alt="Vamsipriya22"/>
545+
<br />
546+
<sub><b>Vamsipriya22</b></sub>
547+
</a>
548+
</td>
549+
</tr>
550+
<tr>
535551
<td align="center">
536552
<a href="https://github.com/EmreYorat">
537553
<img src="https://avatars.githubusercontent.com/u/93644024?v=4" width="100;" alt="EmreYorat"/>
@@ -545,15 +561,6 @@ Once OSM data is obtained, Earth-OSM processes it through several stages:
545561
<br />
546562
<sub><b>AndreCNF</b></sub>
547563
</a>
548-
</td>
549-
</tr>
550-
<tr>
551-
<td align="center">
552-
<a href="https://github.com/AlexanderMeisinger">
553-
<img src="https://avatars.githubusercontent.com/u/91368938?v=4" width="100;" alt="AlexanderMeisinger"/>
554-
<br />
555-
<sub><b>AlexanderMeisinger</b></sub>
556-
</a>
557564
</td>
558565
<td align="center">
559566
<a href="https://github.com/AlessandroPampado99">

‎config.default.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,15 @@ plotting:
10601060
high-temp electrolysis: "magenta"
10611061
today: "#D2691E"
10621062
Ambient: "k"
1063+
industry coal emissions: "#654321"
1064+
agriculture oil: "#1e1e1e"
1065+
gas emissions: "#666666"
1066+
industry oil emissions: "#654321"
1067+
industry electricity: "#222222"
1068+
rail transport electricity: "grey"
1069+
solid biomass for industry: "#654321"
1070+
rail transport oil: "#44DD33"
1071+
low voltage: "y"
10631072

10641073

10651074
nice_names:

‎doc/release_notes.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ This part of documentation collects descriptive release notes to capture the mai
6363

6464
* Add geojson output to build_osm_network `PR #1611 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1611>`__
6565

66+
* Add missing colors for energy carriers in the sector-coupled model `PR #1625 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1625>`__
67+
6668
PyPSA-Earth 0.7.0
6769
=================
6870

0 commit comments

Comments
 (0)