From a98364419dfb4282b649744377be5fcd30dbe6d6 Mon Sep 17 00:00:00 2001 From: Luca Picci Date: Fri, 6 Dec 2024 12:03:52 +0100 Subject: [PATCH 1/2] update changed column names from 2024 dec release --- src/bblocks_data_importers/who/ghed.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bblocks_data_importers/who/ghed.py b/src/bblocks_data_importers/who/ghed.py index 6990cd5..cb2641a 100644 --- a/src/bblocks_data_importers/who/ghed.py +++ b/src/bblocks_data_importers/who/ghed.py @@ -135,8 +135,8 @@ def _format_main_data(self) -> pd.DataFrame: return ( pd.read_excel(self._raw_data, sheet_name="Data", dtype_backend="pyarrow") .drop(columns=["region", "income"]) - .melt(id_vars=["country", "code", "year"], var_name="indicator_code") - .rename(columns={"country": Fields.country_name, "code": Fields.iso3_code}) + .melt(id_vars=["location", "code", "year"], var_name="indicator_code") + .rename(columns={"location": Fields.country_name, "code": Fields.iso3_code}) .pipe(convert_dtypes) ) @@ -189,7 +189,7 @@ def _format_metadata(self) -> pd.DataFrame: """ cols = { - "country": Fields.country_name, + "location": Fields.country_name, "code": Fields.iso3_code, "variable name": Fields.indicator_name, "variable code": Fields.indicator_code, @@ -197,7 +197,7 @@ def _format_metadata(self) -> pd.DataFrame: "Comments": "comments", "Data type": "data_type", "Methods of estimation": "methods_of_estimation", - "Country footnote": "country_footnote", + "Countries and territories footnote": "country_footnote", } try: From b7df5602f654f6a04d4fe1c314a1bfb5a076f3bc Mon Sep 17 00:00:00 2001 From: Luca Picci Date: Fri, 6 Dec 2024 12:08:17 +0100 Subject: [PATCH 2/2] update GHED tests --- tests/test_data/test_ghed.XLSX | Bin 32382 -> 32534 bytes tests/test_who/test_ghed.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_data/test_ghed.XLSX b/tests/test_data/test_ghed.XLSX index 1800bcc4261c70d27dfc4052c0e9e0ecb98faec5..453c40c17a3d68bcb1756c2901bbc1bdb9a8769e 100644 GIT binary patch delta 12008 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 Ap#T5? delta 11798 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 Rz3$j4Ky+9Q&wtkWe*j;`A|U_( diff --git a/tests/test_who/test_ghed.py b/tests/test_who/test_ghed.py index 8341b55..1c7c4c2 100644 --- a/tests/test_who/test_ghed.py +++ b/tests/test_who/test_ghed.py @@ -198,7 +198,7 @@ def test_format_data_missing_columns(mock_raw_data): # format the raw data to remove a required column raw_df = pd.read_excel(mock_raw_data, sheet_name="Data") - raw_df.drop(columns=["country"], inplace=True) + raw_df.drop(columns=["location"], inplace=True) modified_raw_data = io.BytesIO() with pd.ExcelWriter(modified_raw_data, engine="xlsxwriter") as writer: raw_df.to_excel(writer, sheet_name="Data")