From bcce50471e264bcd8376b3c277600af629684083 Mon Sep 17 00:00:00 2001 From: John Whittington Date: Thu, 6 Aug 2020 09:23:39 +0200 Subject: [PATCH] add python3 and pip3 to travis yml --- .travis.yml | 5 +++++ tests/script/bootstrap/common.sh | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 630965a..dce5451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,3 +4,8 @@ compiler: - gcc script: tests/script/runtests.sh before_install: tests/script/bootstrap.sh +addons: + apt: + packages: + - "python3" + - "python3-pip" diff --git a/tests/script/bootstrap/common.sh b/tests/script/bootstrap/common.sh index 20c1037..221dd21 100644 --- a/tests/script/bootstrap/common.sh +++ b/tests/script/bootstrap/common.sh @@ -167,13 +167,7 @@ if [ -z $COMMON_SOURCED ]; then if ! command -v pip3 >/dev/null 2>&1; then echo "Installing Pip..." - if ! command -v easy_install3 >/dev/null 2>&1; then - _install "python3-setuptools" - fi - - if ! command -v easy_install3 >/dev/null 2>&1; then - die "easy_install3 not available, can't install pip3" - fi + _install "python3-pip" $SUDO_CMD easy_install3 pip3 fi