From 70d158756f9221bfd1c3faaf3bb772bc96de28f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Sat, 1 Aug 2020 13:58:32 +0200 Subject: [PATCH] Docker: Switch i-Pi test to Python3 --- tools/docker/scripts/install_basics.sh | 2 +- tools/docker/scripts/install_i-pi.sh | 10 +++++----- tools/docker/scripts/test_i-pi.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/docker/scripts/install_basics.sh b/tools/docker/scripts/install_basics.sh index eb131ad92a..152fa0b31c 100755 --- a/tools/docker/scripts/install_basics.sh +++ b/tools/docker/scripts/install_basics.sh @@ -25,7 +25,7 @@ elif grep -q "Fedora" /etc/os-release ; then git \ less \ nano \ - python3 \ + python3 \ rsync \ wget dnf -q clean all diff --git a/tools/docker/scripts/install_i-pi.sh b/tools/docker/scripts/install_i-pi.sh index a35b2fc91c..b264e879b0 100755 --- a/tools/docker/scripts/install_i-pi.sh +++ b/tools/docker/scripts/install_i-pi.sh @@ -5,14 +5,14 @@ # install Ubuntu packages apt-get update -qq apt-get install -qq --no-install-recommends \ - python \ - python-pip \ - python-wheel \ - python-setuptools + python3 \ + python3-pip \ + python3-wheel \ + python3-setuptools rm -rf /var/lib/apt/lists/* # install python packages -pip install --quiet numpy +pip3 install --quiet numpy # clone i-pi repository git clone --quiet --depth=1 --single-branch -b master https://github.com/i-pi/i-pi.git /opt/i-pi diff --git a/tools/docker/scripts/test_i-pi.sh b/tools/docker/scripts/test_i-pi.sh index 5e2dab96a4..b136e515a8 100755 --- a/tools/docker/scripts/test_i-pi.sh +++ b/tools/docker/scripts/test_i-pi.sh @@ -21,7 +21,7 @@ fi echo -e "\n========== Installing i-Pi ==========" cd /opt/i-pi git pull --quiet -pip install --quiet . +pip3 install --quiet . echo -e "\n========== Running i-Pi Tests =========="