From: Richard Elias Date: Tue, 5 Dec 2017 09:55:36 +0000 (+0000) Subject: install: Python virtualenv python3 enforcement X-Git-Tag: opnfv-6.0.0~39 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=21b23522861e364daf150cd997c5d60851847ef2;p=vswitchperf.git install: Python virtualenv python3 enforcement It was reported that virtualenv-3.x sometimes uses python2.7 instead of python3. This update of the python virtual environment creation scripts, enforces the use of python3 from /usr/bin/python3. The scripts were tested on fresh installations of each currently supported Linux OS. JIRA:VSPERF-551 Change-Id: If909dd9578a3c42b14c1a3e4f9ed7b07a675fb58 Signed-off-by: Richard Elias Reviewed-by: Martin Klozik Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Sridhar Rao Reviewed-by: Trevor Cooper --- diff --git a/systems/centos/prepare_python_env.sh b/systems/centos/prepare_python_env.sh index 5777448b..8bce53cc 100755 --- a/systems/centos/prepare_python_env.sh +++ b/systems/centos/prepare_python_env.sh @@ -2,7 +2,7 @@ # # Prepare Python 3 environment for vsperf execution # -# Copyright 2015 OPNFV +# Copyright 2015-2017 OPNFV # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ if [ -d "$VSPERFENV_DIR" ] ; then fi scl enable python33 " -virtualenv "$VSPERFENV_DIR" +virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt pip install pylint diff --git a/systems/fedora/24/prepare_python_env.sh b/systems/fedora/24/prepare_python_env.sh index b099df5e..920604c2 100644 --- a/systems/fedora/24/prepare_python_env.sh +++ b/systems/fedora/24/prepare_python_env.sh @@ -23,7 +23,7 @@ fi # enable virtual environment in a subshell, so QEMU build can use python 2.7 -(virtualenv-3.5 "$VSPERFENV_DIR" +(virtualenv-3.5 "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt pip install pylint) diff --git a/systems/fedora/25/prepare_python_env.sh b/systems/fedora/25/prepare_python_env.sh index 4a85eb35..c4613ca4 100644 --- a/systems/fedora/25/prepare_python_env.sh +++ b/systems/fedora/25/prepare_python_env.sh @@ -23,7 +23,7 @@ fi # enable virtual environment in a subshell, so QEMU build can use python 2.7 -(virtualenv-3.5 "$VSPERFENV_DIR" +(virtualenv-3.5 "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt pip install pylint diff --git a/systems/fedora/26/prepare_python_env.sh b/systems/fedora/26/prepare_python_env.sh index 33615cbd..05eedfd9 100644 --- a/systems/fedora/26/prepare_python_env.sh +++ b/systems/fedora/26/prepare_python_env.sh @@ -23,7 +23,7 @@ fi # enable virtual environment in a subshell, so QEMU build can use python 2.7 -(virtualenv-3.6 "$VSPERFENV_DIR" +(virtualenv-3.6 "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt pip install pylint diff --git a/systems/opensuse/42.2/prepare_python_env.sh b/systems/opensuse/42.2/prepare_python_env.sh index 66f94cf7..ab668ca4 100755 --- a/systems/opensuse/42.2/prepare_python_env.sh +++ b/systems/opensuse/42.2/prepare_python_env.sh @@ -21,7 +21,7 @@ if [ -d "$VSPERFENV_DIR" ] ; then exit fi -virtualenv "$VSPERFENV_DIR" +virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt pip install pylint diff --git a/systems/opensuse/42.3/prepare_python_env.sh b/systems/opensuse/42.3/prepare_python_env.sh index 66f94cf7..ab668ca4 100755 --- a/systems/opensuse/42.3/prepare_python_env.sh +++ b/systems/opensuse/42.3/prepare_python_env.sh @@ -21,7 +21,7 @@ if [ -d "$VSPERFENV_DIR" ] ; then exit fi -virtualenv "$VSPERFENV_DIR" +virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt pip install pylint diff --git a/systems/rhel/7.2/prepare_python_env.sh b/systems/rhel/7.2/prepare_python_env.sh index bd468d80..0178954e 100755 --- a/systems/rhel/7.2/prepare_python_env.sh +++ b/systems/rhel/7.2/prepare_python_env.sh @@ -2,7 +2,7 @@ # # Prepare Python environment for vsperf execution on Red Hat 7.2 systems. # -# Copyright 2016 OPNFV, Intel Corporation, Red Hat Inc. +# Copyright 2016-2017 OPNFV, Intel Corporation, Red Hat Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ if [ -d "$VSPERFENV_DIR" ] ; then fi scl enable python33 " -virtualenv "$VSPERFENV_DIR" +virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt pip install pylint diff --git a/systems/rhel/7.3/prepare_python_env.sh b/systems/rhel/7.3/prepare_python_env.sh index 3ba049e8..a9021451 100755 --- a/systems/rhel/7.3/prepare_python_env.sh +++ b/systems/rhel/7.3/prepare_python_env.sh @@ -2,7 +2,7 @@ # # Prepare Python environment for vsperf execution on RHEL 7.3 systems. # -# Copyright 2016 OPNFV, Intel Corporation, Red Hat Inc. +# Copyright 2016-2017 OPNFV, Intel Corporation, Red Hat Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ if [ -d "$VSPERFENV_DIR" ] ; then fi scl enable python33 " -virtualenv "$VSPERFENV_DIR" +virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt pip install pylint diff --git a/systems/ubuntu/14.04/prepare_python_env.sh b/systems/ubuntu/14.04/prepare_python_env.sh index 6ef8680d..4c98dc42 100755 --- a/systems/ubuntu/14.04/prepare_python_env.sh +++ b/systems/ubuntu/14.04/prepare_python_env.sh @@ -2,7 +2,7 @@ # # Prepare Python environment for vsperf execution on Ubuntu 14.04 systems # -# Copyright 2015 OPNFV, Intel Corporation. +# Copyright 2015-2017 OPNFV, Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ fi # enable virtual environment in a subshell, so QEMU build can use python 2.7 -(virtualenv "$VSPERFENV_DIR" +(virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt pip install pylint)