From d8ecebab140aa936bb296e019241538b82734ef2 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Tue, 18 Feb 2020 15:50:38 +0200 Subject: [PATCH] Fix installer --- tljh/installer.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tljh/installer.py b/tljh/installer.py index d8b8b63..3527725 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -254,18 +254,22 @@ def ensure_user_environment(user_requirements_txt_file): miniconda_old_version = '4.5.4' miniconda_new_version = '4.7.10' - conda_version = '4.5.8' + miniconda_installer_md5 = "1c945f2b3335c7b2b15130b1b2dc5cf4" - # 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 - ) and not conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_new_version): - miniconda_installer_md5 = "1c945f2b3335c7b2b15130b1b2dc5cf4" + if conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_new_version): conda_version = '4.8.1' + else: + if conda.check_miniconda_version( + USER_ENV_PREFIX, miniconda_old_version + ) + conda_version = '4.5.8' + # If no prior miniconda installation is found, we can install a newer version + else: + logger.info('Downloading & setting up user environment...') + with conda.download_miniconda_installer(miniconda_new_version, miniconda_installer_md5) as installer_path: + conda.install_miniconda(installer_path, USER_ENV_PREFIX) + conda_version = '4.8.1' - logger.info('Downloading & setting up user environment...') - with conda.download_miniconda_installer(miniconda_new_version, miniconda_installer_md5) as installer_path: - conda.install_miniconda(installer_path, USER_ENV_PREFIX) conda.ensure_conda_packages(USER_ENV_PREFIX, [ # Conda's latest version is on conda much more so than on PyPI.