From 207253abc6ec81112abf0a64a8bf68e227528d64 Mon Sep 17 00:00:00 2001
From: Simon John <git@the-jedi.co.uk>
Date: Tue, 4 Aug 2020 23:19:49 +0100
Subject: Rebased python3 branch with some changes from tuna-f1sh@87d5241

---
 tests/script/bootstrap/common.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests/script/bootstrap/common.sh')

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
-- 
cgit v1.2.3


From bcce50471e264bcd8376b3c277600af629684083 Mon Sep 17 00:00:00 2001
From: John Whittington <git@jbrengineering.co.uk>
Date: Thu, 6 Aug 2020 09:23:39 +0200
Subject: add python3 and pip3 to travis yml

---
 tests/script/bootstrap/common.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'tests/script/bootstrap/common.sh')

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
-- 
cgit v1.2.3


From bf319c49b7f7ff17e073422a3ba06a701e12f590 Mon Sep 17 00:00:00 2001
From: John Whittington <git@jbrengineering.co.uk>
Date: Thu, 6 Aug 2020 19:21:23 +0200
Subject: platform neutral examples and manual cherry-pick merge of
 https://github.com/alissa-huskey/Arduino-Makefile/tree/test_fixes

---
 tests/script/bootstrap/common.sh | 2 --
 1 file changed, 2 deletions(-)

(limited to 'tests/script/bootstrap/common.sh')

diff --git a/tests/script/bootstrap/common.sh b/tests/script/bootstrap/common.sh
index 221dd21..2b879b8 100644
--- a/tests/script/bootstrap/common.sh
+++ b/tests/script/bootstrap/common.sh
@@ -168,8 +168,6 @@ if [ -z $COMMON_SOURCED ]; then
     if ! command -v pip3 >/dev/null 2>&1; then
         echo "Installing Pip..."
         _install "python3-pip"
-
-        $SUDO_CMD easy_install3 pip3
     fi
 
     PIP_SUDO_CMD=
-- 
cgit v1.2.3