Clean up get_conda_base()

The deploy and bootstrap scripts are now getting totally different
conda bases in totally different ways so a shared function doesn't
make sense anymore.  This merge splits the functionality back into
these 2 scripts for better clarity and simplicity.

Author: xylar

e3sm_supported_machines/bootstrap.py

@@ -14,7 +14,6 @@
 from shared import (
     check_call,
     get_base,
-    get_conda_base,
     get_rc_dev_labels,
     install_miniforge3,
     parse_args,
@@ -412,9 +411,8 @@ def main():
     else:
         is_test = not config.getboolean('e3sm_unified', 'release')
 
-    conda_base = get_conda_base(
-        args.conda_base, config, version, shared=True, machine=machine
-    )
+    base_path = get_base(config, version)
+    conda_base = os.path.join(base_path, machine, 'conda')
     conda_base = os.path.abspath(conda_base)
 
     source_activation_scripts = \

e3sm_supported_machines/deploy_e3sm_unified.py

@@ -4,12 +4,12 @@
 
 import os
 import sys
+import warnings
 
 from configparser import ConfigParser
 
 from shared import (
     check_call,
-    get_conda_base,
     install_miniforge3,
     parse_args,
 )
@@ -27,6 +27,25 @@ def get_config(config_file):
     return config
 
 
+def get_conda_base(conda_base):
+    if conda_base is None:
+        if 'CONDA_EXE' in os.environ:
+            # if this is a test, assume we're the same base as the
+            # environment currently active
+            conda_exe = os.environ['CONDA_EXE']
+            conda_base = os.path.abspath(
+                os.path.join(conda_exe, '..', '..'))
+            warnings.warn(
+                f'--conda path not supplied.  Using conda installed at '
+                f'{conda_base}')
+        else:
+            raise ValueError('No conda base provided with --conda and '
+                             'none could be inferred.')
+    # handle "~" in the path
+    conda_base = os.path.abspath(os.path.expanduser(conda_base))
+    return conda_base
+
+
 def bootstrap(activate_install_env, source_path, local_conda_build):
 
     print('Creating the e3sm_unified conda environment')
@@ -84,9 +103,8 @@ def main():
     source_path = os.getcwd()
 
     config = get_config(args.config_file)
-    version = args.version
 
-    conda_base = get_conda_base(args.conda_base, config, version, shared=False)
+    conda_base = get_conda_base(args.conda_base)
     conda_base = os.path.abspath(conda_base)
 
     source_activation_scripts = \

e3sm_supported_machines/shared.py

@@ -3,7 +3,6 @@
 import subprocess
 import os
 import platform
-import warnings
 
 try:
     from urllib.request import urlopen, Request
@@ -138,32 +137,6 @@ def get_base(config, version):
     return base_path
 
 
-def get_conda_base(conda_base, config, version, shared, machine=None):
-    if shared:
-        base_path = get_base(config, version)
-        if machine is None:
-            raise ValueError(
-                "Machine must be specified for shared conda base"
-            )
-        conda_base = os.path.join(base_path, machine, 'conda')
-    elif conda_base is None:
-        if 'CONDA_EXE' in os.environ:
-            # if this is a test, assume we're the same base as the
-            # environment currently active
-            conda_exe = os.environ['CONDA_EXE']
-            conda_base = os.path.abspath(
-                os.path.join(conda_exe, '..', '..'))
-            warnings.warn(
-                f'--conda path not supplied.  Using conda installed at '
-                f'{conda_base}')
-        else:
-            raise ValueError('No conda base provided with --conda and '
-                             'none could be inferred.')
-    # handle "~" in the path
-    conda_base = os.path.abspath(os.path.expanduser(conda_base))
-    return conda_base
-
-
 def get_rc_dev_labels(meta_yaml_path):
     """Parse meta.yaml and return a list of dev labels for RC dependencies."""