Переглянути джерело

[DATALAD] Recorded changes

Daniel Busch 1 місяць тому
батько
коміт
a411ccb0d6

+ 1 - 1
extracted_data/v2024-11-14/FAOSTAT_Agrifood_system_emissions_v2024-11-14.csv

@@ -1 +1 @@
-../../.git/annex/objects/fq/31/MD5E-s6106149--8ac5dc82f1efde02f221637477a3147b.csv/MD5E-s6106149--8ac5dc82f1efde02f221637477a3147b.csv
+../../.git/annex/objects/V0/86/MD5E-s6108082--4bc478a0a08d6d251864d63eac81fd86.csv/MD5E-s6108082--4bc478a0a08d6d251864d63eac81fd86.csv

+ 1 - 1
extracted_data/v2024-11-14/FAOSTAT_Agrifood_system_emissions_v2024-11-14.nc

@@ -1 +1 @@
-../../.git/annex/objects/1m/xF/MD5E-s1917874--847a6ef01320ee0c265bbbbf0220ac3a.nc/MD5E-s1917874--847a6ef01320ee0c265bbbbf0220ac3a.nc
+../../.git/annex/objects/80/mF/MD5E-s1919490--4d7a0c5874bc4b5c9d8718fa1ad46e73.nc/MD5E-s1919490--4d7a0c5874bc4b5c9d8718fa1ad46e73.nc

+ 1 - 1
extracted_data/v2024-11-14/FAOSTAT_Agrifood_system_emissions_v2024-11-14_raw.csv

@@ -1 +1 @@
-../../.git/annex/objects/VK/1Q/MD5E-s33863965--e76229b224f4df989def18921ef16c6a.csv/MD5E-s33863965--e76229b224f4df989def18921ef16c6a.csv
+../../.git/annex/objects/xp/61/MD5E-s34032099--9dfa52731d2cd7d035ea8aafa2a8f650.csv/MD5E-s34032099--9dfa52731d2cd7d035ea8aafa2a8f650.csv

+ 1 - 1
extracted_data/v2024-11-14/FAOSTAT_Agrifood_system_emissions_v2024-11-14_raw.nc

@@ -1 +1 @@
-../../.git/annex/objects/vg/xf/MD5E-s15070132--3f6ad29b3a9140e506c33b6a1be88aa8.nc/MD5E-s15070132--3f6ad29b3a9140e506c33b6a1be88aa8.nc
+../../.git/annex/objects/FK/5f/MD5E-s15105589--f8ffeab6ace6ff5a8e94995dffdb206b.nc/MD5E-s15105589--f8ffeab6ace6ff5a8e94995dffdb206b.nc

+ 4 - 4
src/faostat_data_primap/helper/definitions.py

@@ -445,8 +445,8 @@ read_config_all: Any = {
             "filename": "Emissions_livestock_E_All_Data_NOFLAG.csv",
             "areas_to_remove": [
                 *areas_to_remove_base,
-                "Belgium-Luxembourg",
-                "Serbia and Montenegro",
+                # "Belgium-Luxembourg",
+                # "Serbia and Montenegro",
                 "European Union (27)",
             ],
             "items_to_remove": [
@@ -584,8 +584,8 @@ read_config_all: Any = {
             "filename": "Emissions_livestock_E_All_Data_NOFLAG.csv",
             "areas_to_remove": [
                 *areas_to_remove_base,
-                "Belgium-Luxembourg",
-                "Serbia and Montenegro",
+                # "Belgium-Luxembourg",
+                # "Serbia and Montenegro",
                 "European Union (27)",
             ],
             "items_to_remove": [

+ 14 - 13
tests/unit/test_conversion.py

@@ -35,18 +35,18 @@ def test_processed_output_remains_the_same():
 @pytest.mark.parametrize(
     "domains_and_releases_to_read",
     [
-        pytest.param(
-            [
-                ("farm_gate_agriculture_energy", "2023-12-13"),
-                ("farm_gate_emissions_crops", "2023-11-09"),
-                ("farm_gate_livestock", "2023-11-09"),
-                ("land_use_drained_organic_soils", "2023-11-09"),
-                ("land_use_fires", "2023-11-09"),
-                ("land_use_forests", "2023-11-09"),
-                ("pre_post_agricultural_production", "2023-11-09"),
-            ],
-            id="2023 release",
-        ),
+        # pytest.param(
+        #     [
+        #         ("farm_gate_agriculture_energy", "2023-12-13"),
+        #         ("farm_gate_emissions_crops", "2023-11-09"),
+        #         ("farm_gate_livestock", "2023-11-09"),
+        #         ("land_use_drained_organic_soils", "2023-11-09"),
+        #         ("land_use_fires", "2023-11-09"),
+        #         ("land_use_forests", "2023-11-09"),
+        #         ("pre_post_agricultural_production", "2023-11-09"),
+        #     ],
+        #     id="2023 release",
+        # ),
         pytest.param(
             [
                 ("farm_gate_agriculture_energy", "2024-11-14"),
@@ -65,7 +65,8 @@ def test_read(tmp_path, domains_and_releases_to_read):
     read_data(
         domains_and_releases_to_read=domains_and_releases_to_read,
         read_path=downloaded_data_path,
-        save_path=tmp_path,
+        # save_path=tmp_path,
+        save_path=extracted_data_path,
     )