diff options
| author | Simon John <git@the-jedi.co.uk> | 2020-08-04 23:19:49 +0100 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2020-08-04 23:19:49 +0100 |
| commit | 207253abc6ec81112abf0a64a8bf68e227528d64 (patch) | |
| tree | b289b1a3ad4d2793e38e5072353b9f5484f98a7b /tests | |
| parent | 6f786a96b0acfb0c9b2d2f4e39911d2803088729 (diff) | |
Rebased python3 branch with some changes from tuna-f1sh@87d5241
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/script/bootstrap/common.sh | 18 | ||||
| -rw-r--r-- | tests/script/bootstrap/pip-requirements.txt | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/script/bootstrap/common.sh b/tests/script/bootstrap/common.sh index c3cd90e..20c1037 100644 --- a/tests/script/bootstrap/common.sh +++ b/tests/script/bootstrap/common.sh @@ -160,22 +160,22 @@ if [ -z $COMMON_SOURCED ]; then fi fi - if ! command -v python >/dev/null 2>&1; then + if ! command -v python3 >/dev/null 2>&1; then echo "Installing Python..." - _install "python" + _install "python3" fi - if ! command -v pip >/dev/null 2>&1; then + if ! command -v pip3 >/dev/null 2>&1; then echo "Installing Pip..." - if ! command -v easy_install >/dev/null 2>&1; then - _install "python-setuptools" + if ! command -v easy_install3 >/dev/null 2>&1; then + _install "python3-setuptools" fi - if ! command -v easy_install >/dev/null 2>&1; then - die "easy_install not available, can't install pip" + if ! command -v easy_install3 >/dev/null 2>&1; then + die "easy_install3 not available, can't install pip3" fi - $SUDO_CMD easy_install pip + $SUDO_CMD easy_install3 pip3 fi PIP_SUDO_CMD= @@ -184,7 +184,7 @@ if [ -z $COMMON_SOURCED ]; then PIP_SUDO_CMD=$SUDO_CMD fi - $PIP_SUDO_CMD pip install --src dependencies --pre -Ur $BOOTSTRAP_DIR/pip-requirements.txt + $PIP_SUDO_CMD pip3 install --src dependencies --pre -Ur $BOOTSTRAP_DIR/pip-requirements.txt COMMON_SOURCED=1 fi diff --git a/tests/script/bootstrap/pip-requirements.txt b/tests/script/bootstrap/pip-requirements.txt index 8313187..205196f 100644 --- a/tests/script/bootstrap/pip-requirements.txt +++ b/tests/script/bootstrap/pip-requirements.txt @@ -1 +1 @@ -pyserial==2.7 +pyserial==3.4 |