Only upgrade miniconda in fresh installs

jupyterhub · Jan 30, 2020 · fb5fdcb · fb5fdcb
1 parent 7a9122e
commit fb5fdcb
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/tljh/installer.py b/tljh/installer.py
@@ -236,16 +236,16 @@ def ensure_user_environment(user_requirements_txt_file):
     Set up user conda environment with required packages
     """
     logger.info("Setting up user environment...")
-    if "python3.7" in sys.executable:
-        conda_version = '4.8.1'
+
+    miniconda_old_version = '4.5.4'
+    conda_version = '4.5.8'
+
+    # If no prior miniconda installation is found, we can install a newer version
+    if not conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_old_version):
         miniconda_version = '4.7.10'
         miniconda_installer_md5 = "1c945f2b3335c7b2b15130b1b2dc5cf4"
-    else:
-        conda_version = '4.5.8'
-        miniconda_version = '4.5.4'
-        miniconda_installer_md5 = "a946ea1d0c4a642ddf0c3a26a18bb16d"
+        conda_version = '4.8.1'
 
-    if not conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_version):
         logger.info('Downloading & setting up user environment...')
         with conda.download_miniconda_installer(miniconda_version, miniconda_installer_md5) as installer_path:
             conda.install_miniconda(installer_path, USER_ENV_PREFIX)