From 9bb0df10e3fa7b457580506b0354d7d53971a7dc Mon Sep 17 00:00:00 2001 From: Julien Lamy Date: Wed, 2 May 2018 18:27:22 +0200 Subject: [PATCH] Use system pip in deb ci --- .ci/deb/install | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/deb/install b/.ci/deb/install index 3c156eab..339f1c23 100755 --- a/.ci/deb/install +++ b/.ci/deb/install @@ -23,7 +23,7 @@ PACKAGES="${PACKAGES} libdcmtk2-dev libicu-dev libjsoncpp-dev liblog4cpp5-dev zl # Dependencies of Python wrappers PACKAGES="${PACKAGES} libboost-python-dev ${PYTHON_PREFIX}-dev" # Dependencies of unit tests -PACKAGES="${PACKAGES} dcmtk libboost-test-dev ${PYTHON_PREFIX}-nose" +PACKAGES="${PACKAGES} dcmtk libboost-test-dev ${PYTHON_PREFIX}-pip ${PYTHON_PREFIX}-nose" # Coverage and static analysis PACKAGES="${PACKAGES} cppcheck lcov wget" diff --git a/.travis.yml b/.travis.yml index 199f4c86..c7cf570f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo -E sh ./.ci/deb/install; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./.ci/brew/install; fi - - if [ "${CC}" = "gcc" ]; then pip${Python} install -U --user cpp-coveralls; fi + - if [ "${CC}" = "gcc" ]; then /usr/bin/pip${Python} install -U --user cpp-coveralls; fi - if [ "${CC}" = "gcc" ]; then export PATH=$(python -c 'import site; print(site.getuserbase())')/bin:${PATH}; fi script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ./.ci/deb/build; fi