Merge branch 'develop' into feature_525_update_plotly_kaleido

Author: bikegeek

docs/conf.py

@@ -25,7 +25,7 @@
 copyright = '2025, NSF NCAR'
 author = 'UCAR/NSF NCAR, NOAA, CSU/CIRA, and CU/CIRES'
 author_list = 'Fisher, H., D. Adriaansen, C. Kalb, D. Fillmore, T. Jensen, L. Goodrich, M. Win-Gildenmeister and T. Burek'
-version = '3.1.0-rc1'
+version = '3.2.0-beta1-dev'
 verinfo = version
 release = f'{version}'
 release_year = '2025'

internal/scripts/installation/modulefiles/3.1.0_casper

@@ -10,7 +10,7 @@ proc ModulesHelp { } {
 module load ncarenv/24.12
 module load intel/2024.2.1
 
-prepend-path PATH /glade/work/dtcrt/METplus/casper/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin
+prepend-path PATH /glade/work/dtcrt/METplus/casper/miniconda/miniconda3/envs/metplus_v6.1_py3.12/bin
 
 setenv METPLOTPY_SOURCE /glade/work/dtcrt/METplus/casper/components/METplotpy/installations/METplotpy-3.1.0
 setenv METPLOTPY_BASE /glade/work/dtcrt/METplus/casper/components/METplotpy/installations/METplotpy-3.1.0

internal/scripts/installation/modulefiles/3.1.0_hera

@@ -12,7 +12,7 @@ prereq intel/2024.2.1
 setenv METPLOTPY_SOURCE /contrib/METplotpy/METplotpy-3.1.0
 setenv METPLOTPY_BASE /contrib/METplotpy/METplotpy-3.1.0
 
-prepend-path PATH /scratch1/BMC/dtc/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin
+prepend-path PATH /scratch1/BMC/dtc/miniconda/miniconda3/envs/metplus_v6.1_py3.12/bin
 prepend-path PATH /contrib/METplotpy/METplotpy-3.1.0/metplotpy/contributed
 prepend-path PATH /contrib/METplotpy/METplotpy-3.1.0/metplotpy/plots/performance_diagram
 prepend-path PATH /contrib/METplotpy/METplotpy-3.1.0/metplotpy/plots

internal/scripts/installation/modulefiles/3.1.0_jet

@@ -12,7 +12,7 @@ prereq intel/2024.2.1
 setenv METPLOTPY_SOURCE /contrib/met/METplotpy/METplotpy-3.1.0
 setenv METPLOTPY_BASE /contrib/met/METplotpy/METplotpy-3.1.0
 
-prepend-path PATH /lfs5/HFIP/dtc-hurr/METplus/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin
+prepend-path PATH /lfs6/HFIP/dtc-hurr/METplus/miniconda/miniconda3/envs/metplus_v6.1_py3.12/bin
 prepend-path PATH /contrib/met/METplotpy/METplotpy-3.1.0/metplotpy/contributed
 prepend-path PATH /contrib/met/METplotpy/METplotpy-3.1.0/metplotpy/plots/performance_diagram
 prepend-path PATH /contrib/met/METplotpy/METplotpy-3.1.0/metplotpy/plots

internal/scripts/installation/modulefiles/3.1.0_orion

@@ -8,13 +8,13 @@ proc ModulesHelp { } {
 }
 
 module load contrib
-module load intel-oneapi-compilers/2022.2.1
+module load intel-oneapi-compilers/2024.1.0
 
 setenv METPLOTPY_SOURCE /apps/contrib/MET/METplotpy/METplotpy-3.1.0
 setenv METPLOTPY_BASE /apps/contrib/MET/METplotpy/METplotpy-3.1.0
 
 #setenv METPLOTPY_PATH /apps/contrib/MET/METplotpy/METplotpy-3.1.0/
-prepend-path PATH /work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin
+prepend-path PATH /work/noaa/ovp/miniconda/miniconda3/envs/metplus_v6.1_py3.12/bin
 prepend-path PATH /apps/contrib/MET/METplotpy/METplotpy-3.1.0/metplotpy/contributed
 prepend-path PATH /apps/contrib/MET/METplotpy/METplotpy-3.1.0/metplotpy/plots/performance_diagram
 prepend-path PATH /apps/contrib/MET/METplotpy/METplotpy-3.1.0/metplotpy/plots

internal/scripts/installation/modulefiles/3.2.0_ursa

@@ -0,0 +1,25 @@
+#%Module######################################################################
+##
+##      METplotpy
+##
+proc ModulesHelp { } {
+  puts stderr "Sets up the paths and environment variables to use the METplotpy-3.2.0.
+     *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***"
+}
+
+prereq intel-oneapi-compilers/2025.1.1
+
+setenv METPLOTPY_SOURCE /contrib/METplotpy/METplotpy-3.2.0
+setenv METPLOTPY_BASE /contrib/METplotpy/METplotpy-3.2.0
+
+prepend-path PATH /scratch3/BMC/dtc/METplus/miniconda/miniconda3/envs/metplus_v6.1_py3.12/bin
+prepend-path PATH /contrib/METplotpy/METplotpy-3.2.0/metplotpy/contributed
+prepend-path PATH /contrib/METplotpy/METplotpy-3.2.0/metplotpy/plots/performance_diagram
+prepend-path PATH /contrib/METplotpy/METplotpy-3.2.0/metplotpy/plots
+prepend-path PATH /contrib/METplotpy/METplotpy-3.2.0/metplotpy
+prepend-path PATH /contrib/METplotpy/METplotpy-3.2.0
+prepend-path PYTHONPATH /contrib/METplotpy/METplotpy-3.2.0/metplotpy/contributed
+prepend-path PYTHONPATH /contrib/METplotpy/METplotpy-3.2.0/metplotpy/plots/performance_diagram
+prepend-path PYTHONPATH /contrib/METplotpy/METplotpy-3.2.0/metplotpy/plots
+prepend-path PYTHONPATH /contrib/METplotpy/METplotpy-3.2.0/metplotpy
+prepend-path PYTHONPATH /contrib/METplotpy/METplotpy-3.2.0

metplotpy/contributed/stratosphere_diagnostics/stratosphere_plots.py

@@ -109,7 +109,9 @@ def plot_qbo_phase_circuits(inits,periods,rean_qbo_pcs,rfcst_qbo_pcs,outfile):
 
 def plot_qbo_phase_space(rean_qbo_pcs,eofs,ptitle,outfile):
 
-    from mpl_toolkits.axes_grid1.inset_locator import (inset_axes, mark_inset)
+
+    from mpl_toolkits.axes_grid1.inset_locator import mark_inset
+
 
     fig = plt.figure(4)
 

metplotpy/plots/base_plot.py

@@ -32,6 +32,7 @@
 import kaleido
 kaleido.get_chrome_sync()
 
+
 class BasePlot:
     """A class that provides methods for building Plotly plot's common features
      like title, axis, legend.