mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

[#1877] fixed building docs by switching venv from py2 to py3

Browse Source
This commit is contained in:
Michal Nowikowski
2021-05-20 08:16:01 +02:00
parent 0a9b2a0dde
commit 49fd1ed35d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hammer.py
View File

@@ -867,15 +867,15 @@ class VagrantEnv(object):
self.nofeatures_arg = '' self.nofeatures_arg = ''
# install python3 for centos 8 # install python3 for centos 8
if self.system == 'centos' and self.revision == '8': if self.system == 'centos':
self.execute("sudo dnf install -y python36 rpm-build python3-virtualenv", attempts=3) if self.revision == '7':
self.python = 'python3' self.execute("sudo yum remove -y python-devel")
self.execute("sudo yum install -y python36 rpm-build python3-virtualenv", attempts=3)
else:
self.execute("sudo dnf install -y python36 rpm-build python3-virtualenv", attempts=3)
# select proper python version for running Hammer inside Vagrant system # select proper python version for running Hammer inside Vagrant system
if (self.system == 'centos' and self.revision == '7' or if self.system == 'freebsd':
(self.system == 'debian' and self.revision == '8' and self.provider != 'lxc')):
self.python = 'python'
elif self.system == 'freebsd':
self.python = 'python3.6' self.python = 'python3.6'
else: else:
self.python = 'python3' self.python = 'python3'
@@ -1301,7 +1301,7 @@ def prepare_system_local(features, check_times):
install_pkgs(packages, env=env, check_times=check_times) install_pkgs(packages, env=env, check_times=check_times)
if 'docs' in features: if 'docs' in features:
execute('virtualenv ~/venv', execute('virtualenv-3 ~/venv',
env=env, timeout=60, check_times=check_times) env=env, timeout=60, check_times=check_times)
execute('~/venv/bin/pip install sphinx sphinx-rtd-theme', execute('~/venv/bin/pip install sphinx sphinx-rtd-theme',
env=env, timeout=120, check_times=check_times) env=env, timeout=120, check_times=check_times)