Rename function to avoid name confusion

Author: willu47

src/osemosys2iamc/resultify.py

@@ -65,7 +65,7 @@ def filter_technologies(df: pd.DataFrame, technologies: List[str]) -> pd.DataFra
     """
     return filter_regex(df, technologies, 'TECHNOLOGY')
 
-def filter_fuel(df: pd.DataFrame, technologies: List, fuels: List) -> pd.DataFrame:
+def filter_technology_fuel(df: pd.DataFrame, technologies: List, fuels: List) -> pd.DataFrame:
     """Return rows which match ``technologies`` and ``fuels``
     """
     df = filter_technologies(df, technologies)
@@ -290,7 +290,7 @@ def main(config: Dict, inputs_path: str, results_path: str) -> pyam.IamDataFrame
                 unit = result['unit']
                 if 'fuel' in result.keys():
                     fuels = result['fuel']
-                    data = filter_fuel(results, technologies, fuels)
+                    data = filter_technology_fuel(results, technologies, fuels)
                 elif 'emissions' in result.keys():
                     if 'tech_emi' in result.keys():
                         emission = result['emissions']

tests/test_resultify.py

@@ -2,7 +2,7 @@
 import pandas as pd
 import os
 import pytest
-from osemosys2iamc.resultify import (filter_fuel,
+from osemosys2iamc.resultify import (filter_technology_fuel,
                                      filter_emission_tech,
                                      filter_final_energy,
                                      filter_capacity,
@@ -107,7 +107,7 @@ def test_filter_fuel(self):
 
         technologies = ['ALUPLANT']
         fuels = ['C1_P_HCO']
-        actual = filter_fuel(input_data, technologies, fuels)
+        actual = filter_technology_fuel(input_data, technologies, fuels)
 
         data = [
             ["Globe",  2010,  0.828098],