From 9812e64e8228be3e297fcf5e959e2bf31f526d35 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Tue, 29 Mar 2022 09:17:28 +0200
Subject: [PATCH] resolve cherry merge conflict 2

---
 envs/environment.yaml          | 2 +-
 scripts/build_hydro_profile.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/envs/environment.yaml b/envs/environment.yaml
index 795aa334..9772d882 100644
--- a/envs/environment.yaml
+++ b/envs/environment.yaml
@@ -37,6 +37,7 @@ dependencies:
   - matplotlib
   - proj
   - fiona <= 1.18.20  # Till issue https://github.com/Toblerity/Fiona/issues/1085 is not solved
+  - country_converter
 
   # Keep in conda environment when calling ipython
   - ipython
@@ -50,7 +51,6 @@ dependencies:
   - geopy
   - tqdm
   - pytz
-  - country_converter
   - tabula-py
 
   - pip:
diff --git a/scripts/build_hydro_profile.py b/scripts/build_hydro_profile.py
index 0fb20b06..4add4c85 100644
--- a/scripts/build_hydro_profile.py
+++ b/scripts/build_hydro_profile.py
@@ -79,6 +79,7 @@ def get_eia_annual_hydro_generation(fn, countries):
     df.loc["Germany"] = df.filter(like='Germany', axis=0).sum()
     df.loc["Serbia"] += df.loc["Kosovo"]
     df = df.loc[~df.index.str.contains('Former')]
+    df.drop(["Europe", "Germany, West", "Germany, East"], inplace=True)
 
     df.index = cc.convert(df.index, to='iso2')
     df.index.name = 'countries'