Merge branch 'martinhjel-dev'

PyPSA · May 12, 2024 · 1d80a51 · 1d80a51
2 parents a592a56 + 421c3c1
commit 1d80a51
Show file tree

Hide file tree

Showing 4 changed files with 6,892 additions and 6,354 deletions.
diff --git a/doc/release-notes.rst b/doc/release-notes.rst
@@ -2,8 +2,10 @@ History of Changes
 ==================
 
 
-.. Upcoming Version
-.. ----------------
+Upcoming Version
+----------------
+
+* Updated the JRC hydro power plant database to the latest version.
 
 Version 0.5.14 (30.04.2024)
 ---------------------------
@@ -46,6 +48,7 @@ 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

diff --git a/powerplantmatching/data.py b/powerplantmatching/data.py
@@ -402,10 +402,7 @@ def JRC(raw=False, update=False, config=None):
 
     fn = get_raw_file("JRC", update, config)
 
-    with ZipFile(fn, "r") as file:
-        directory = file.namelist()[0]
-        key = directory + "data/jrc-hydro-power-plant-database.csv"
-        df = pd.read_csv(file.open(key))
+    df = pd.read_csv(fn)
 
     if raw:
         return df

diff --git a/powerplantmatching/package_data/config.yaml b/powerplantmatching/package_data/config.yaml
@@ -76,8 +76,8 @@ ENTSOE-EIC:
   fn: entsoe_eic_codes.csv
 JRC:
   reliability_score: 4
-  fn: jrc-hydro-power-database-10.zip
-  url: https://github.com/energy-modelling-toolkit/hydro-power-database/archive/refs/tags/v10.zip
+  fn: jrc-hydro-power-plant-database.csv
+  url: https://raw.githubusercontent.com/energy-modelling-toolkit/hydro-power-database/fd7535c/data/jrc-hydro-power-plant-database.csv
 GEO:
   net_capacity: false
   reliability_score: 3