From 2dec48bdfd8521ae2f8369b8d2f06123aa70e96d Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:14:26 -0700 Subject: [PATCH 01/23] Update debug_chk_plot.py --- pcmdi_metrics/mjo/lib/debug_chk_plot.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/mjo/lib/debug_chk_plot.py b/pcmdi_metrics/mjo/lib/debug_chk_plot.py index 59fb2b53b..eb30129a2 100644 --- a/pcmdi_metrics/mjo/lib/debug_chk_plot.py +++ b/pcmdi_metrics/mjo/lib/debug_chk_plot.py @@ -7,8 +7,7 @@ def debug_chk_plot(d_seg_x_ano, Power, OEE, segment_year, daSeaCyc, segment_ano_year): - if not os.path.exists("debug"): - os.makedirs("debug") + os.makedirs("debug", exist_ok=True) """ FIX ME --- x = vcs.init() From 72aef746742f75b5d130e1d85564eedaa691c62c Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:16:50 -0700 Subject: [PATCH 02/23] Update post_process_plot.py --- pcmdi_metrics/mjo/lib/post_process_plot.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/mjo/lib/post_process_plot.py b/pcmdi_metrics/mjo/lib/post_process_plot.py index b9b60e0a7..b92a8f697 100644 --- a/pcmdi_metrics/mjo/lib/post_process_plot.py +++ b/pcmdi_metrics/mjo/lib/post_process_plot.py @@ -22,8 +22,7 @@ def main(): imgdir = "/work/lee1043/imsi/result_test/mjo_metrics/plot_test" # imgdir = '/p/user_pub/pmp/pmp_results/pmp_v1.1.2/graphics/mjo/'+mip+'/historical/'+version - if not os.path.exists(imgdir): - os.makedirs(imgdir) + os.makedirs(imgdir, exist_ok=True) ncfile_list = glob.glob(os.path.join(datadir, "*.nc")) From 77fb91ab508355f3c3e782da6cc08d3394caf26e Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:18:39 -0700 Subject: [PATCH 03/23] Update parallel_driver.py --- pcmdi_metrics/mjo/scripts/parallel_driver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/mjo/scripts/parallel_driver.py b/pcmdi_metrics/mjo/scripts/parallel_driver.py index 99f287549..d43cc9db5 100755 --- a/pcmdi_metrics/mjo/scripts/parallel_driver.py +++ b/pcmdi_metrics/mjo/scripts/parallel_driver.py @@ -91,8 +91,7 @@ # Create output directories # ------------------------------------------------- for output_type in ["graphics", "diagnostic_results", "metrics_results"]: - if not os.path.exists(outdir(output_type=output_type)): - os.makedirs(outdir(output_type=output_type)) + os.makedirs(outdir(output_type=output_type), exist_ok=True) print(outdir(output_type=output_type)) # ================================================= From 7bdf829085e577afbd877408ac78344ee499168a Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:19:56 -0700 Subject: [PATCH 04/23] Update mjo_metric_calc.py --- pcmdi_metrics/mjo/lib/mjo_metric_calc.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pcmdi_metrics/mjo/lib/mjo_metric_calc.py b/pcmdi_metrics/mjo/lib/mjo_metric_calc.py index 6785915d2..ea6962071 100644 --- a/pcmdi_metrics/mjo/lib/mjo_metric_calc.py +++ b/pcmdi_metrics/mjo/lib/mjo_metric_calc.py @@ -159,15 +159,13 @@ def mjo_metric_ewr_calculation( # NetCDF output if nc_out: - if not os.path.exists(outdir(output_type="diagnostic_results")): - os.makedirs(outdir(output_type="diagnostic_results")) + os.makedirs(outdir(output_type="diagnostic_results"), exist_ok=True) fout = os.path.join(outdir(output_type="diagnostic_results"), output_filename) write_netcdf_output(OEE, fout) # Plot if plot: - if not os.path.exists(outdir(output_type="graphics")): - os.makedirs(outdir(output_type="graphics")) + os.makedirs(outdir(output_type="graphics"), exist_ok=True) fout = os.path.join(outdir(output_type="graphics"), output_filename) title = ( mip.upper() From ce6b32f8da7c9f3b680cddbd7ab772f30710272d Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:20:46 -0700 Subject: [PATCH 05/23] Update calc_ratio.py --- pcmdi_metrics/precip_variability/scripts_pcmdi/calc_ratio.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/precip_variability/scripts_pcmdi/calc_ratio.py b/pcmdi_metrics/precip_variability/scripts_pcmdi/calc_ratio.py index fca91d4b3..fd1400a45 100644 --- a/pcmdi_metrics/precip_variability/scripts_pcmdi/calc_ratio.py +++ b/pcmdi_metrics/precip_variability/scripts_pcmdi/calc_ratio.py @@ -39,8 +39,7 @@ / psdmfm_ref["RESULTS"][dat_ref][frc][dom][frq] ) - if not (os.path.isdir(outdir)): - os.makedirs(outdir) + os.makedirs(outdir, exist_ok=True) outfile = open(os.path.join(outdir, model.split("/")[-1]), "w") json.dump(psdmfm, outfile, sort_keys=True, indent=4, separators=(",", ": ")) outfile.close() From 075f230133ef8e3af3ad5bd0bfe0de19fcfc2a70 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:22:10 -0700 Subject: [PATCH 06/23] Update savg_fourier.py --- pcmdi_metrics/diurnal/scripts/savg_fourier.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/diurnal/scripts/savg_fourier.py b/pcmdi_metrics/diurnal/scripts/savg_fourier.py index 734dd20d0..16109ea41 100755 --- a/pcmdi_metrics/diurnal/scripts/savg_fourier.py +++ b/pcmdi_metrics/diurnal/scripts/savg_fourier.py @@ -225,8 +225,7 @@ def spacevavg(tvarb1, tvarb2, sftlf, model): return outD print("Preparing to write output to JSON file ...") - if not os.path.exists(args.results_dir): - os.makedirs(args.results_dir) + os.makedirs(args.results_dir, exist_ok=True) jsonFile = populateStringConstructor(args.outnamejson, args) jsonFile.month = monthname From 5b0960a57c1c8b0a3322c6effc7756d8d05bd1df Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:23:03 -0700 Subject: [PATCH 07/23] Update fourierDiurnalGridpoints.py --- pcmdi_metrics/diurnal/scripts/fourierDiurnalGridpoints.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/diurnal/scripts/fourierDiurnalGridpoints.py b/pcmdi_metrics/diurnal/scripts/fourierDiurnalGridpoints.py index 3e50e46cf..106eebe62 100755 --- a/pcmdi_metrics/diurnal/scripts/fourierDiurnalGridpoints.py +++ b/pcmdi_metrics/diurnal/scripts/fourierDiurnalGridpoints.py @@ -83,8 +83,7 @@ def main(): ascFile.month = monthname ascname = os.path.join(os.path.abspath(args.results_dir), ascFile()) - if not os.path.exists(os.path.dirname(ascname)): - os.makedirs(os.path.dirname(ascname)) + os.makedirs(os.path.dirname(ascname), exist_ok=True) fasc = open(ascname, "w") gridptlats = [float(x) for x in args.lats] From 9d1b796498bbec93390317b024623ed5d5eccd4e Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:27:23 -0700 Subject: [PATCH 08/23] Update pcmdi_compute_climatologies-CMOR.py --- .../mean_climate/scripts/pcmdi_compute_climatologies-CMOR.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/mean_climate/scripts/pcmdi_compute_climatologies-CMOR.py b/pcmdi_metrics/mean_climate/scripts/pcmdi_compute_climatologies-CMOR.py index 03e2aecd0..24c6d9bfc 100644 --- a/pcmdi_metrics/mean_climate/scripts/pcmdi_compute_climatologies-CMOR.py +++ b/pcmdi_metrics/mean_climate/scripts/pcmdi_compute_climatologies-CMOR.py @@ -668,8 +668,7 @@ def runClim(A): print( "Your Python does not have CMOR, using regular cdms to write out files" ) - if not os.path.exists(A.results_dir): - os.makedirs(A.results_dir) + os.makedirs(A.results_dir, exist_ok=True) end_tc = tc[-1].add(1, cdtime.Month) # Populate fout template with values From 695544f84552d1f7b0bd865c8f7c4213fbe6446d Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:27:56 -0700 Subject: [PATCH 09/23] Update enso_driver.py --- pcmdi_metrics/enso/enso_driver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/enso/enso_driver.py b/pcmdi_metrics/enso/enso_driver.py index 3ed6072f4..c648c5479 100755 --- a/pcmdi_metrics/enso/enso_driver.py +++ b/pcmdi_metrics/enso/enso_driver.py @@ -125,8 +125,7 @@ # Create output directory for output_type in ["graphics", "diagnostic_results", "metrics_results"]: - if not os.path.exists(outdir(output_type=output_type)): - os.makedirs(outdir(output_type=output_type)) + os.makedirs(outdir(output_type=output_type), exist_ok=True) print("output directory for " + output_type + ":" + outdir(output_type=output_type)) # list of variables From 88520c843344ed6d647149a443d054451e7f5253 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:28:37 -0700 Subject: [PATCH 10/23] Update std_of_dailymeans.py --- pcmdi_metrics/diurnal/scripts/std_of_dailymeans.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/diurnal/scripts/std_of_dailymeans.py b/pcmdi_metrics/diurnal/scripts/std_of_dailymeans.py index 9f4ce2256..79587a6e9 100755 --- a/pcmdi_metrics/diurnal/scripts/std_of_dailymeans.py +++ b/pcmdi_metrics/diurnal/scripts/std_of_dailymeans.py @@ -131,8 +131,7 @@ def compute(param): print("TEMPLATE NAME:", template()) print("Preparing to write output to JSON file ...") - if not os.path.exists(args.results_dir): - os.makedirs(args.results_dir) + os.makedirs(args.results_dir, exist_ok=True) jsonFile = populateStringConstructor(args.outnamejson, args) jsonFile.month = monthname From 3f30d0b5ea48b14d7072fbcbf521f8707325802a Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:29:03 -0700 Subject: [PATCH 11/23] Update std_of_hourlyvalues.py --- pcmdi_metrics/diurnal/scripts/std_of_hourlyvalues.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/diurnal/scripts/std_of_hourlyvalues.py b/pcmdi_metrics/diurnal/scripts/std_of_hourlyvalues.py index 2e7c7357f..4f0d79574 100755 --- a/pcmdi_metrics/diurnal/scripts/std_of_hourlyvalues.py +++ b/pcmdi_metrics/diurnal/scripts/std_of_hourlyvalues.py @@ -142,8 +142,7 @@ def compute(param): # lonrange = (285.0, 295.0) print("Preparing to write output to JSON file ...") - if not os.path.exists(args.results_dir): - os.makedirs(args.results_dir) + os.makedirs(args.results_dir, exist_ok=True) jsonFile = populateStringConstructor(args.outnamejson, args) jsonFile.month = monthname From 81eb12cc59d873ec2c581601c1ad08a767fed85a Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:29:26 -0700 Subject: [PATCH 12/23] Update computeStdOfDailyMeans.py --- pcmdi_metrics/diurnal/scripts/computeStdOfDailyMeans.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/diurnal/scripts/computeStdOfDailyMeans.py b/pcmdi_metrics/diurnal/scripts/computeStdOfDailyMeans.py index 7ba255b27..823058e75 100755 --- a/pcmdi_metrics/diurnal/scripts/computeStdOfDailyMeans.py +++ b/pcmdi_metrics/diurnal/scripts/computeStdOfDailyMeans.py @@ -106,8 +106,7 @@ def compute(params): ) except Exception as err: print("Failed for model: %s with error: %s" % (dataname, err)) - if not os.path.exists(args.results_dir): - os.makedirs(args.results_dir) + os.makedirs(args.results_dir, exist_ok=True) g = cdms2.open(os.path.join(args.results_dir, stdoutfile), "w") g.write(stdvalues) g.close() From 857bff34b50f26abbb90bd09b64d92501aa70b64 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:29:55 -0700 Subject: [PATCH 13/23] Update driver_monsoon_sperber.py --- pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py b/pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py index a92302d2f..60b16dcce 100644 --- a/pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py +++ b/pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py @@ -139,8 +139,7 @@ def tree(): # Create output directory for output_type in ["graphics", "diagnostic_results", "metrics_results"]: - if not os.path.exists(outdir(output_type=output_type)): - os.makedirs(outdir(output_type=output_type)) + os.makedirs(outdir(output_type=output_type), exist_ok=True) print(outdir(output_type=output_type)) # Debug From f0ee7db62a45ce1deec425861f856e84f10c7314 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:30:19 -0700 Subject: [PATCH 14/23] Update std_of_meandiurnalcycle.py --- pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycle.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycle.py b/pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycle.py index 3df10fd50..0abb14c14 100755 --- a/pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycle.py +++ b/pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycle.py @@ -143,8 +143,7 @@ def compute(param): # lonrange = (285.0, 295.0) print("Preparing to write output to JSON file ...") - if not os.path.exists(args.results_dir): - os.makedirs(args.results_dir) + os.makedirs(args.results_dir, exist_ok=True) jsonFile = populateStringConstructor(args.outnamejson, args) jsonFile.month = monthname From b947bbe9ca3b91c4d2882d4c220f07f64abd9d03 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:30:57 -0700 Subject: [PATCH 15/23] Update variability_across_timescales_PS_driver.py --- .../variability_across_timescales_PS_driver.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pcmdi_metrics/precip_variability/variability_across_timescales_PS_driver.py b/pcmdi_metrics/precip_variability/variability_across_timescales_PS_driver.py index ca71d87e2..c606be499 100644 --- a/pcmdi_metrics/precip_variability/variability_across_timescales_PS_driver.py +++ b/pcmdi_metrics/precip_variability/variability_across_timescales_PS_driver.py @@ -39,11 +39,7 @@ str(outdir_template(output_type="%(output_type)", mip=mip, case_id=case_id)) ) for output_type in ["graphics", "diagnostic_results", "metrics_results"]: - if not os.path.exists(outdir(output_type=output_type)): - try: - os.makedirs(outdir(output_type=output_type)) - except FileExistsError: - pass + os.makedirs(outdir(output_type=output_type), exist_ok=True) print(outdir(output_type=output_type)) # Check data in advance From 9f82b006d54c84f20be1cafe9b92c5985dc61c08 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:31:23 -0700 Subject: [PATCH 16/23] Update enso_driver_obsOnly.py --- pcmdi_metrics/enso/scripts_pcmdi/enso_driver_obsOnly.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/enso/scripts_pcmdi/enso_driver_obsOnly.py b/pcmdi_metrics/enso/scripts_pcmdi/enso_driver_obsOnly.py index 9582bc92e..74bb74ee1 100755 --- a/pcmdi_metrics/enso/scripts_pcmdi/enso_driver_obsOnly.py +++ b/pcmdi_metrics/enso/scripts_pcmdi/enso_driver_obsOnly.py @@ -104,8 +104,7 @@ # Create output directory for output_type in ["graphics", "diagnostic_results", "metrics_results"]: - if not os.path.exists(outdir(output_type=output_type)): - os.makedirs(outdir(output_type=output_type)) + os.makedirs(outdir(output_type=output_type), exist_ok=True) print(outdir(output_type=output_type)) # list of variables From 02bb7ee516e199b5c3543dcbddcfddf108a2a3cc Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:31:52 -0700 Subject: [PATCH 17/23] Update parallel_driver.py --- .../variability_mode/scripts_pcmdi/parallel_driver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/variability_mode/scripts_pcmdi/parallel_driver.py b/pcmdi_metrics/variability_mode/scripts_pcmdi/parallel_driver.py index b7dbd01a4..eed0ce129 100755 --- a/pcmdi_metrics/variability_mode/scripts_pcmdi/parallel_driver.py +++ b/pcmdi_metrics/variability_mode/scripts_pcmdi/parallel_driver.py @@ -99,8 +99,7 @@ # Create output directories # ------------------------------------------------- for output_type in ["graphics", "diagnostic_results", "metrics_results"]: - if not os.path.exists(outdir(output_type=output_type)): - os.makedirs(outdir(output_type=output_type)) + os.makedirs(outdir(output_type=output_type), exist_ok=True) print(outdir(output_type=output_type)) # ================================================= From a7eaec6213c380349abe6b1c48750ede225be1a4 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:32:31 -0700 Subject: [PATCH 18/23] Update variability_modes_driver.py --- pcmdi_metrics/variability_mode/variability_modes_driver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/variability_mode/variability_modes_driver.py b/pcmdi_metrics/variability_mode/variability_modes_driver.py index a94ac6d0d..2d4741541 100755 --- a/pcmdi_metrics/variability_mode/variability_modes_driver.py +++ b/pcmdi_metrics/variability_mode/variability_modes_driver.py @@ -269,8 +269,7 @@ # Create output directories # ------------------------------------------------- for output_type in ["graphics", "diagnostic_results", "metrics_results"]: - if not os.path.exists(outdir(output_type=output_type)): - os.makedirs(outdir(output_type=output_type)) + os.makedirs(outdir(output_type=output_type), exist_ok=True) print(outdir(output_type=output_type)) # ================================================= From 8f0914da9ef571f26525972cc6674309c5b1cbb7 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:32:54 -0700 Subject: [PATCH 19/23] Update parallel_driver.py --- pcmdi_metrics/enso/scripts_pcmdi/parallel_driver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/enso/scripts_pcmdi/parallel_driver.py b/pcmdi_metrics/enso/scripts_pcmdi/parallel_driver.py index 7eae1bafe..5a030dc97 100755 --- a/pcmdi_metrics/enso/scripts_pcmdi/parallel_driver.py +++ b/pcmdi_metrics/enso/scripts_pcmdi/parallel_driver.py @@ -94,8 +94,7 @@ # Create output directories # ------------------------------------------------- for output_type in ["graphics", "diagnostic_results", "metrics_results"]: - if not os.path.exists(outdir(output_type=output_type)): - os.makedirs(outdir(output_type=output_type)) + os.makedirs(outdir(output_type=output_type), exist_ok=True) print(outdir(output_type=output_type)) # ================================================= From ea0f04b6af7ef78a9e21b949b9ebfb2ebd1cd9c2 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:33:20 -0700 Subject: [PATCH 20/23] Update mjo_metrics_driver.py --- pcmdi_metrics/mjo/mjo_metrics_driver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/mjo/mjo_metrics_driver.py b/pcmdi_metrics/mjo/mjo_metrics_driver.py index b95bb8187..0dc44c676 100755 --- a/pcmdi_metrics/mjo/mjo_metrics_driver.py +++ b/pcmdi_metrics/mjo/mjo_metrics_driver.py @@ -137,8 +137,7 @@ # Create output directory for output_type in ["graphics", "diagnostic_results", "metrics_results"]: - if not os.path.exists(outdir(output_type=output_type)): - os.makedirs(outdir(output_type=output_type)) + os.makedirs(outdir(output_type=output_type), exist_ok=True) print(outdir(output_type=output_type)) # Generate CMEC compliant json From 5bd1002dc5862d3dad0c3bc11971ca143dc20e8b Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:33:45 -0700 Subject: [PATCH 21/23] Update test_resources.py --- tests/test_resources.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_resources.py b/tests/test_resources.py index add768857..67058c0bf 100644 --- a/tests/test_resources.py +++ b/tests/test_resources.py @@ -9,7 +9,7 @@ def test_conda_env(tmpdir): pmp_share_path = os.path.join(conda_prefix, "share", "pmp") - os.makedirs(pmp_share_path) + os.makedirs(pmp_share_path, exist_ok=True) with mock.patch.dict(os.environ, {"CONDA_PREFIX": conda_prefix}): path = resources.resource_path() @@ -27,7 +27,7 @@ def test_conda_env_no_exist(resource_filename, getcwd, tmpdir): getcwd_path = os.path.join(tmpdir, "share", "pmp") - os.makedirs(getcwd_path) + os.makedirs(getcwd_path, exist_ok=True) getcwd.return_value = tmpdir From 51f345737152fecfaa3be7e0bde57993e399a1bd Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:34:09 -0700 Subject: [PATCH 22/23] Update basepmpgraphics.py --- tests/deprecated/basepmpgraphics.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/deprecated/basepmpgraphics.py b/tests/deprecated/basepmpgraphics.py index 6e2206d4c..51e148ffa 100755 --- a/tests/deprecated/basepmpgraphics.py +++ b/tests/deprecated/basepmpgraphics.py @@ -40,8 +40,7 @@ def setUp(self): # self.x.open() self.orig_cwd = os.getcwd() self.pngsdir = "tests_png" - if not os.path.exists(self.pngsdir): - os.makedirs(self.pngsdir) + os.makedirs(self.pngsdir, exist_ok=True) self.basedir = os.path.join(os.path.dirname(__file__), "graphics") From 54e73758eed779c2f1cba3aa7cd057b0cb000044 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Fri, 28 Apr 2023 13:34:38 -0700 Subject: [PATCH 23/23] Update compositeDiurnalStatistics.py --- pcmdi_metrics/diurnal/scripts/compositeDiurnalStatistics.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pcmdi_metrics/diurnal/scripts/compositeDiurnalStatistics.py b/pcmdi_metrics/diurnal/scripts/compositeDiurnalStatistics.py index c2a5f1414..76815b61c 100755 --- a/pcmdi_metrics/diurnal/scripts/compositeDiurnalStatistics.py +++ b/pcmdi_metrics/diurnal/scripts/compositeDiurnalStatistics.py @@ -173,8 +173,7 @@ def compute(params): str(args.lastyear), ) LSToutfile = "%s_%s_LocalSolarTimes.nc" % (varbname, dataname) - if not os.path.exists(args.results_dir): - os.makedirs(args.results_dir) + os.makedirs(args.results_dir, exist_ok=True) f = cdms2.open(os.path.join(args.results_dir, avgoutfile), "w") g = cdms2.open(os.path.join(args.results_dir, stdoutfile), "w") h = cdms2.open(os.path.join(args.results_dir, LSToutfile), "w")