Don't upgrade venv python

This commit is contained in:
GeorgianaElena
2020-01-30 12:03:35 +02:00
parent 8b5d7ee79a
commit 6b930b2401

View File

@@ -113,11 +113,7 @@ def main():
logger.setLevel(logging.DEBUG) logger.setLevel(logging.DEBUG)
logger.info('Checking if TLJH is already installed...') logger.info('Checking if TLJH is already installed...')
python3_version = "python3"
if os.path.exists(os.path.join(hub_prefix, 'bin', '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...') logger.info('TLJH already installed, upgrading...')
initial_setup = False initial_setup = False
else: else:
@@ -134,15 +130,14 @@ def main():
run_subprocess(['apt-get', 'update', '--yes']) run_subprocess(['apt-get', 'update', '--yes'])
run_subprocess(['apt-get', 'install', '--yes', run_subprocess(['apt-get', 'install', '--yes',
'python3.7', 'python3',
'python3.7-venv', 'python3-venv',
'python3.7-dev',
'python3-pip', 'python3-pip',
'git' 'git'
]) ])
logger.info('Installed python & virtual environment') logger.info('Installed python & virtual environment')
os.makedirs(hub_prefix, exist_ok=True) 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') logger.info('Set up hub virtual environment')
if initial_setup: if initial_setup:
@@ -166,9 +161,9 @@ def main():
logger.info('Starting TLJH installer...') logger.info('Starting TLJH installer...')
os.execv( 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', '-m',
'tljh.installer', 'tljh.installer',
] + sys.argv[1:] ] + sys.argv[1:]