From f906b28cc9c38369666b920a675e5d79fbf5505d Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Wed, 22 Nov 2023 21:47:46 -0800 Subject: [PATCH 1/2] sort models case insensitive --- pcmdi_metrics/graphics/share/read_json_mean_clim.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcmdi_metrics/graphics/share/read_json_mean_clim.py b/pcmdi_metrics/graphics/share/read_json_mean_clim.py index a67195c31..4467e99ef 100644 --- a/pcmdi_metrics/graphics/share/read_json_mean_clim.py +++ b/pcmdi_metrics/graphics/share/read_json_mean_clim.py @@ -148,11 +148,11 @@ def extract_data(results_dict, var_list, region, stat, season, mip, debug=False) Return a pandas dataframe for metric numbers at given region/stat/season. Rows: models, Columns: variables (i.e., 2d array) """ - model_list = sorted(list(results_dict[var_list[0]]["RESULTS"].keys())) + model_list = sorted(list(results_dict[var_list[0]]["RESULTS"].keys()), key=str.casefold) # update model_list if "rlut" in list(results_dict.keys()): if "rlut" in list(results_dict["rlut"]["RESULTS"].keys()): - model_list = sorted(list(results_dict["rlut"]["RESULTS"].keys())) + model_list = sorted(list(results_dict["rlut"]["RESULTS"].keys()), key=str.casefold) print("extract_data:: model_list: ", model_list) From 131fd8696d9de6583d71dea409fc34d6a7730858 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Wed, 22 Nov 2023 21:49:48 -0800 Subject: [PATCH 2/2] pre-commit fix --- pcmdi_metrics/graphics/share/read_json_mean_clim.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pcmdi_metrics/graphics/share/read_json_mean_clim.py b/pcmdi_metrics/graphics/share/read_json_mean_clim.py index 4467e99ef..bd72e5db3 100644 --- a/pcmdi_metrics/graphics/share/read_json_mean_clim.py +++ b/pcmdi_metrics/graphics/share/read_json_mean_clim.py @@ -148,11 +148,15 @@ def extract_data(results_dict, var_list, region, stat, season, mip, debug=False) Return a pandas dataframe for metric numbers at given region/stat/season. Rows: models, Columns: variables (i.e., 2d array) """ - model_list = sorted(list(results_dict[var_list[0]]["RESULTS"].keys()), key=str.casefold) + model_list = sorted( + list(results_dict[var_list[0]]["RESULTS"].keys()), key=str.casefold + ) # update model_list if "rlut" in list(results_dict.keys()): if "rlut" in list(results_dict["rlut"]["RESULTS"].keys()): - model_list = sorted(list(results_dict["rlut"]["RESULTS"].keys()), key=str.casefold) + model_list = sorted( + list(results_dict["rlut"]["RESULTS"].keys()), key=str.casefold + ) print("extract_data:: model_list: ", model_list)