New py3 updates for casper

Machines/dav_modules

@@ -2,18 +2,21 @@
 
 echo "Python boot-strap modules for NCAR DAV"
 
-module load python/3.7.5
 module load gnu/9.1.0
 module load ncarenv
 module load ncarcompilers
 module load openmpi/4.0.3
 module load netcdf/4.7.3
 module load nco/4.7.9
 module load ncl/6.6.2
+module load conda
+
+conda activate
 
 # clone the ncat virtualenv first with helper script ncar_pylib
 # use "ncar_pylib --help" to see all options
-ncar_pylib -c 20200417 ${pp_dir}/cesm-env2
+#ncar_pylib -c 20200417 ${pp_dir}/cesm-env2
+mamba create -p ${pp_dir}/cesm-env2 --clone npl
 
 export PYTHONPATH=${pp_dir}/cesm-env2/lib/python3.7/site-packages
 

cesm_utils/setup.py

@@ -58,5 +58,4 @@ def get_dependencies():
     zip_safe=True,
     test_suite="cesm_utils.tests",
     description="CESM CASEROOT post-processing utilities.",
-    use_2to3=True,
 )

conform/setup.py

@@ -56,6 +56,5 @@ def get_dependencies():
     zip_safe=True,
     test_suite="conform.tests",
     description="CESM Python Experiment Conform Tool.",
-    use_2to3=True,
     requires=['pyconform']
 )

create_python_env

@@ -165,7 +165,8 @@ cd $pp_dir
 # activate virtualenv for remainder of this script
 #----------------------------------------------------------------------
 echo "$progname - activating virtual environment in ${pp_dir}/cesm-env2."
-. cesm-env2/bin/activate
+#. cesm-env2/bin/activate
+conda activate ./cesm-env2
 
 #----------------------------------------------------------------------
 # install post processing packages

diag_utils/setup.py

@@ -58,5 +58,4 @@ def get_dependencies():
     zip_safe=True,
     test_suite="diag_utils.tests",
     description="CESM diagnostics utilities.",
-    use_2to3=True,
 )

diagnostics/setup.py

@@ -62,5 +62,4 @@ def get_dependencies():
     zip_safe=True,
     test_suite="diagnostics.tests",
     description="CESM Python Diagnostics Tools.",
-    use_2to3=True,
 )

ocean_remap/setup.py

@@ -57,5 +57,4 @@ def get_dependencies():
     zip_safe=True,
     #test_suite="timeseries.tests",
     description="CESM2 CMIP6 Ocean file remapping tool.",
-    use_2to3=True
 )

timeseries/setup.py

@@ -58,6 +58,5 @@ def get_dependencies():
     zip_safe=True,
     test_suite="timeseries.tests",
     description="CESM Time-Series Generation Tool.",
-    use_2to3=True,
     requires=['pyreshaper']
 )

timeseries/template.timeseries

@@ -46,8 +46,7 @@ def _main_func(description):
             "unit_testing" : False
             }
         executable, mpi_arg_list = env_mach_specific.get_mpirun(case, mpi_attribs, job, overrides=overrides)
-#        cmd = executable+" "+" ".join(mpi_arg_list) + " " + run_exe
-        cmd = "/home/jedwards/anaconda2/envs/ppenv/bin/mpirun " + run_exe
+        cmd = executable+" "+" ".join(mpi_arg_list) + " " + run_exe
         os.environ["ARGS_FOR_SCRIPT"] = " --caseroot={}".format(os.path.join(caseroot,"postprocess"))
         cmd = case.get_resolved_value(cmd)
         print("MPICMD: {}".format(cmd))