Skip to content

GitLab

Commit 2e144b6e authored by Jason Swails's avatar Jason Swails
Browse files

Revert "easy_install doesn't work for pytest (anymore)" 

This reverts commit cfb0d18d.
parent 29f8057f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
.travis.yml
View file @ 2e144b6e
...@@ -110,8 +110,7 @@ before_install: ...@@ -110,8 +110,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew install fftw; brew install fftw;
brew install -y https://raw.githubusercontent.com/Homebrew/homebrew-core/5b680fb58fedfb00cd07a7f69f5a621bb9240f3b/Formula/doxygen.rb; brew install -y https://raw.githubusercontent.com/Homebrew/homebrew-core/5b680fb58fedfb00cd07a7f69f5a621bb9240f3b/Formula/doxygen.rb;
sudo easy_install pip; sudo easy_install pytest;
sudo pip install pytest;
fi fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
CMAKE_URL="http://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"; CMAKE_URL="http://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment