From fb874771c9c757ff918788d8eb608f1001d529d3 Mon Sep 17 00:00:00 2001 From: Vincent Fu Date: Thu, 28 May 2020 10:12:52 -0400 Subject: [PATCH] travis: install python3 scipy for Linux and macOS tests Since the test scripts triggered by TravisCI now all rely on python3, make sure we always install scipy for python3. Signed-off-by: Vincent Fu --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9de0b2a2..eba16baa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,10 +44,10 @@ before_install: pkgs=(libaio-dev libcunit1 libcunit1-dev libgoogle-perftools4 libibverbs-dev libiscsi-dev libnuma-dev librbd-dev librdmacm-dev libz-dev); if [[ "$BUILD_ARCH" == "x86" ]]; then pkgs=("${pkgs[@]/%/:i386}"); - pkgs+=(gcc-multilib python-scipy); + pkgs+=(gcc-multilib python3-scipy); EXTRA_CFLAGS="${EXTRA_CFLAGS} -m32"; else - pkgs+=(glusterfs-common python-scipy); + pkgs+=(glusterfs-common python3-scipy); fi; sudo apt-get -qq update; sudo apt-get install --no-install-recommends -qq -y "${pkgs[@]}"; @@ -55,10 +55,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install cunit; - if [[ "$TRAVIS_OSX_IMAGE" == "xcode11.2" ]]; then - pip3 install scipy; - fi; - pip install scipy; + pip3 install scipy; fi; script: - ./configure --extra-cflags="${EXTRA_CFLAGS}" && make -- 2.25.1