Browse Source

[DATALAD] Recorded changes

Daniel Busch 2 months ago
parent
commit
037d5b4afe
2 changed files with 5 additions and 4 deletions
  1. 3 3
      src/faostat_data_primap/read.py
  2. 2 1
      tests/integration/test_download_and_read.py

+ 3 - 3
src/faostat_data_primap/read.py

@@ -20,11 +20,10 @@ from faostat_data_primap.helper.definitions import (
     config_to_if,
     read_config_all,
 )
-
-# todo replace with FAO climate categories once it's done
 from faostat_data_primap.helper.paths import (
     downloaded_data_path,
     extracted_data_path,
+    root_path,
 )
 
 
@@ -349,8 +348,9 @@ def process(ds: xarray.Dataset):
     gases = ["CO2", "CH4", "N2O"]
 
     for var in gases:
+        conversion_path = root_path / f"conversion_FAO_IPPCC2006_PRIMAP_{var}.csv"
         conv[var] = cc.Conversion.from_csv(
-            f"../../conversion_FAO_IPPCC2006_PRIMAP_{var}.csv",
+            conversion_path,
             cats=cats,
         )
 

+ 2 - 1
tests/integration/test_download_and_read.py

@@ -47,8 +47,9 @@ def test_download_all_domains(tmp_path):
     assert release_folder[0].startswith("v")
 
     output_files = os.listdir(extracted_data_path / release_folder[0])
+
     # in the folder there should be three files
-    assert len(output_files) == 3
+    assert len(output_files) == 6
 
     # a .yaml, .csv, and .nc file
     required_extensions = {"nc", "csv", "yaml"}