Merge pull request #138 from PyPSA/prepare-release-v0.5.8

prepare release v0.5.8
PyPSA · Oct 30, 2023 · 3628a8b · 3628a8b
2 parents 8e0261c + 42ba390
commit 3628a8b
Show file tree

Hide file tree

Showing 8 changed files with 6,299 additions and 5,414 deletions.
diff --git a/analysis/compare-with-entsoe-stats.py b/analysis/compare-with-entsoe-stats.py
@@ -54,8 +54,9 @@ def parse(c):
 # https://www.statista.com/statistics/496283/total-electricity-generation-capacity-uk/
 stats.loc["GB", "Natural Gas"] = 37000  # (adding ~10GW)
 stats.loc["GB", "Other"] = 1400  # (subtracting ~10GW)
+stats.loc["DE", "Nuclear"] = 0
 
-
+# %%
 totals = powerplants.powerplant.lookup().fillna(0)
 
 sources = [s if isinstance(s, str) else list(s)[0] for s in config["matching_sources"]]
@@ -133,3 +134,5 @@ def parse(c):
     fig.tight_layout()
     fig.savefig(figpath / f"country-comparison/{c}.png", dpi=150)
     plt.close()
+
+# %%
diff --git a/doc/release-notes.rst b/doc/release-notes.rst
@@ -4,15 +4,22 @@ History of Changes
 
 .. Upcoming Version
 .. ----------------
-**New Features**
 
 
+Version 0.5.8 (30.10.2023)
+-------------------------
+
+**New Features**
+
 * Datasets from the Global Energy Monitor are now combined into one dataset called `GEM`. This is per default used in the matching process.
 * Updates the following Global Energy Monitor data according to latest May 2023 release: 
   * `GSPT`, solar power plant
   * `GWPT`, wind power plant
 * Changing Global Energy Monitor dataset name to -latest to avoid data update PRs in powerplantmatching
   but rather encourage updates in `Global Energy Monitor data repo <https://github.com/pz-max/gem-powerplant-data>`__.
+
+**Fixes**
+
 * In the aggregation and merge process, the `DateIn` and `DateOut` columns are now aggregated by taking the minimum and maximum value respectively.
 
 

diff --git a/powerplantmatching/__init__.py b/powerplantmatching/__init__.py
@@ -24,7 +24,7 @@
 
 from __future__ import absolute_import
 
-__version__ = "0.5.7"
+__version__ = "0.5.8"
 __author__ = "Fabian Hofmann"
 __copyright__ = "Copyright 2017-2022 Technical University of Berlin"
 # The rough hierarchy of this package is

diff --git a/powerplantmatching/cleaning.py b/powerplantmatching/cleaning.py
@@ -143,7 +143,7 @@ def gather_and_replace(df, mapping):
     """
     Search for patterns in multiple columns and return a series of represantativ keys.
 
-    The function will return a series of unique identifyers given by the keys of the
+    The function will return a series of unique identifiers given by the keys of the
     `mapping` dictionary. The order in the `mapping` dictionary determines which
     represantativ keys are calculated first. Note that these may be overwritten by
     the following mappings.

diff --git a/powerplantmatching/heuristics.py b/powerplantmatching/heuristics.py
@@ -148,7 +148,7 @@ def rescale_capacities_to_country_totals(df, fueltypes=None):
     in order to match the statistics of the ENTSOe country totals. For every
     country the information about the total capacity of each fueltype is given.
     The scaling factor is determined by the ratio of the aggregated capacity of
-    the fueltype within each coutry and the ENTSOe statistics about the
+    the fueltype within each country and the ENTSOe statistics about the
     fueltype capacity total within each country.
 
     Parameters

diff --git a/powerplantmatching/package_data/config.yaml b/powerplantmatching/package_data/config.yaml
@@ -10,7 +10,7 @@ google_api_key:
 
 # This query is applied to all input data
 # Note: querying "key == key" filters out nan values
-main_query: "Name != '' and (DateOut >= 2020 or DateOut != DateOut) and (lat >= 30 or lat != lat)"
+main_query: "Name != '' and (DateOut >= 2020 or DateOut != DateOut) and (lat >= 30 or lat != lat) and not (Country == 'Germany' and Fueltype == 'Nuclear')"
 
 # matching_sources, only the matched powerplants are added to the final dataset
 matching_sources:
@@ -34,7 +34,7 @@ fully_included_sources:
   - JRC: Country not in ['Switzerland', 'Albania', 'United Kingdom', 'Norway']
   - OPSD: Country not in ['Switzerland', 'Italy', 'Spain', 'Norway', 'Austria']
   - BEYONDCOAL
-  - GEM
+  # - GEM
 
 
 parallel_duke_processes: false
@@ -158,10 +158,10 @@ GGPT:
 GEM: 
   # combined data set of all GEM trackers
   net_capacity: True
-  reliability_score: 5
+  reliability_score: 4
 GCPT:
   net_capacity: false
-  reliability_score: 5
+  reliability_score: 4
   fn: Global-Coal-Plant-Tracker-January-2023.csv
   url: https://raw.githubusercontent.com/pz-max/gem-powerplant-data/main/Global-Coal-Plant-Tracker-latest.csv
 GGTPT:

diff --git a/powerplants.csv b/powerplants.csv
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name="powerplantmatching",
-    version="0.5.7",
+    version="0.5.8",
     author="Fabian Hofmann (FIAS), Jonas Hoersch (KIT), Fabian Gotzens (FZ Jülich)",
     author_email="[email protected]",
     description="Toolset for generating and managing Power Plant Data",