From 6b930b24016fedaa0c9a1f9297d957c2670146fe Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Thu, 30 Jan 2020 12:03:35 +0200 Subject: [PATCH] Don't upgrade venv python --- bootstrap/bootstrap.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py index 5cdc17e..98e7245 100644 --- a/bootstrap/bootstrap.py +++ b/bootstrap/bootstrap.py @@ -113,11 +113,7 @@ def main(): logger.setLevel(logging.DEBUG) logger.info('Checking if TLJH is already installed...') - python3_version = "python3" if os.path.exists(os.path.join(hub_prefix, 'bin', 'python3')): - # Check if the existing install is under Python3.7 - if os.path.exists(os.path.join(hub_prefix, 'bin', 'python3.7')): - python3_version = "python3.7" logger.info('TLJH already installed, upgrading...') initial_setup = False else: @@ -134,15 +130,14 @@ def main(): run_subprocess(['apt-get', 'update', '--yes']) run_subprocess(['apt-get', 'install', '--yes', - 'python3.7', - 'python3.7-venv', - 'python3.7-dev', + 'python3', + 'python3-venv', 'python3-pip', 'git' ]) logger.info('Installed python & virtual environment') os.makedirs(hub_prefix, exist_ok=True) - run_subprocess(['python3.7', '-m', 'venv', hub_prefix]) + run_subprocess(['python3', '-m', 'venv', hub_prefix]) logger.info('Set up hub virtual environment') if initial_setup: @@ -166,9 +161,9 @@ def main(): logger.info('Starting TLJH installer...') os.execv( - os.path.join(hub_prefix, 'bin', python3_version), + os.path.join(hub_prefix, 'bin', 'python3'), [ - os.path.join(hub_prefix, 'bin', python3_version), + os.path.join(hub_prefix, 'bin', 'python3'), '-m', 'tljh.installer', ] + sys.argv[1:]