From eb9560c45923b702a949696407b3ca1858865991 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 29 Apr 2018 16:15:01 +0300 Subject: [PATCH] travis: remove unused code Signed-off-by: Ruslan Kuprieiev --- .travis.yml | 7 +++---- scripts/ci/before_install.sh | 9 --------- scripts/ci/install.sh | 4 ---- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 scripts/ci/before_install.sh diff --git a/.travis.yml b/.travis.yml index c68d7e141..8bf44c636 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,13 +45,12 @@ matrix: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then eval "$(pyenv init -)"; - eval "$(pyenv virtualenv-init -)"; pyenv install --skip-existing --keep --verbose "$PYTHON_VER"; pyenv shell "$PYTHON_VER"; - which python; - which pip; - python --version; fi + - which python + - which pip + - python --version install: - bash ./scripts/ci/install.sh script: diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh deleted file mode 100644 index 0e3380acd..000000000 --- a/scripts/ci/before_install.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -x -set -e - -if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - pyenv install $PYTHON_VER - pyenv global $PYTHON_VER -fi diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index 6a0a10bae..b4849ff68 100644 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -3,10 +3,6 @@ set -x set -e -if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - pyenv global $PYTHON_VER -fi - pip install --upgrade pip pip install -r requirements.txt pip install -r test-requirements.txt