Merge pull request #475 from PyPSA/prepare-release-v0.7

prepare release 0.7

.gitattributes

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2022 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

.gitignore

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2022 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

.readthedocs.yml

@@ -1,11 +1,11 @@
-# SPDX-FileCopyrightText: : 2017-2022 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 
 version: 2
 
 python:
-  version: 3.8
+  version: "3.10"
   install:
   - requirements: doc/requirements.txt
   system_packages: true

.reuse/dep5

@@ -12,17 +12,17 @@ Copyright: 2019 Fabian Neumann (TUB, KIT)
 License: CC-BY-4.0
 
 Files: data/*
-Copyright: 2017-2022 The PyPSA-Eur Authors
+Copyright: 2017-2023 The PyPSA-Eur Authors
 License: CC-BY-4.0
 
 Files: .github/*
 Copyright: 2019 The PyPSA-Eur Authors
 License: CC0-1.0
 
 Files: matplotlibrc
-Copyright: : 2017-2022 The PyPSA-Eur Authors
+Copyright: : 2017-2023 The PyPSA-Eur Authors
 License: CC0-1.0
 
 Files: borg-it
-Copyright: : 2017-2022 The PyPSA-Eur Authors
+Copyright: : 2017-2023 The PyPSA-Eur Authors
 License: CC0-1.0

LICENSES/MIT.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2017-2022 The PyPSA-Eur Authors
+Copyright 2017-2023 The PyPSA-Eur Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2017-2022 The PyPSA-Eur Authors
+SPDX-FileCopyrightText: 2017-2023 The PyPSA-Eur Authors
 SPDX-License-Identifier: CC-BY-4.0
 -->
 

Snakefile

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2022 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: MIT
 

config.default.yaml

@@ -1,8 +1,8 @@
-# SPDX-FileCopyrightText: : 2017-2022 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 
-version: 0.6.1
+version: 0.7.0
 tutorial: false
 
 logging:
@@ -233,7 +233,7 @@ load:
 
 costs:
   year: 2030
-  version: v0.4.0
+  version: v0.5.0
   rooftop_share: 0.14  # based on the potentials, assuming  (0.1 kW/m2 and 10 m2/person)
   fill_values:
     FOM: 0
@@ -288,7 +288,7 @@ solving:
     min_iterations: 4
     max_iterations: 6
     clip_p_max_pu: 0.01
-    skip_iterations: false
+    skip_iterations: true
     track_iterations: false
     #nhours: 10
   solver:

config.tutorial.yaml

@@ -1,8 +1,8 @@
-# SPDX-FileCopyrightText: : 2017-2022 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 
-version: 0.6.1
+version: 0.7.0
 tutorial: true
 
 logging:
@@ -50,9 +50,29 @@ electricity:
     battery: 6
     H2: 168
 
-  powerplants_filter: false # use pandas query strings here, e.g. Country not in ['Germany']
-  custom_powerplants: false # use pandas query strings here, e.g. Country in ['Germany']
-  conventional_carriers: [coal, CCGT] # [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
+  # use pandas query strings here, e.g. Country not in ['Germany']
+  powerplants_filter: (DateOut >= 2022 or DateOut != DateOut)
+  # use pandas query strings here, e.g. Country in ['Germany']
+  custom_powerplants: false
+
+  conventional_carriers: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
+  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc, hydro]
+
+  estimate_renewable_capacities:
+    enable: true
+    # Add capacities from OPSD data
+    from_opsd: true
+    # Renewable capacities are based on existing capacities reported by IRENA
+    year: 2020
+    # Artificially limit maximum capacities to factor * (IRENA capacities),
+    # i.e. 110% of <years>'s capacities => expansion_limit: 1.1
+    # false: Use estimated renewable potentials determine by the workflow
+    expansion_limit: false
+    technology_mapping:
+      # Wind is the Fueltype in powerplantmatching, onwind, offwind-{ac,dc} the carrier in PyPSA-Eur
+      Offshore: [offwind-ac, offwind-dc]
+      Onshore: [onwind]
+      PV: [solar]
 
 atlite:
   nprocesses: 4
@@ -163,7 +183,7 @@ load:
 
 costs:
   year: 2030
-  version: v0.4.0
+  version: v0.5.0
   rooftop_share: 0.14
   fill_values:
     FOM: 0

doc/Makefile

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2017-2022 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: 2017-2023 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: MIT