diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-12-07 07:46:04 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-12-07 07:46:04 +0100 |
commit | 5aa61d2bd005e879a457d4043e8a204bd6b2c294 (patch) | |
tree | 13bd998ed863fff449ce19e61e18a7b50b39e7f4 | |
parent | 17cf8da254d88fa42cbe9e7bb486147def47c26b (diff) | |
parent | 3e829fd6f4a3a122da9df35a88e5c51122860bf6 (diff) |
Merge branch 'master' into ctest_shall_output_failures
-rw-r--r-- | .travis.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index fc7a5207..f178e9ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,9 +23,10 @@ matrix: - env: # 4. Only doxygen documentation - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' - - env: - # 5. Only Python, associated tests and sphinx documentation - - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='test sphinx' + # Issue with sphinx-build with sphinx 2.0.1 + # - env: + # # 5. Only Python, associated tests and sphinx documentation + # - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='test sphinx' cache: directories: @@ -54,7 +55,7 @@ before_cache: # When installing through libcgal-dev apt, CMake Error at CGAL Exports.cmake The imported target "CGAL::CGAL Qt5" references the file install: - python3 -m pip install --upgrade pip setuptools wheel - - python3 -m pip install --user pytest Cython sphinx sphinxcontrib-bibtex sphinx-paramlinks matplotlib numpy scipy + - python3 -m pip install --user pytest Cython sphinx sphinxcontrib-bibtex sphinx-paramlinks matplotlib numpy scipy scikit-learn - python3 -m pip install --user POT script: |