From 8827aad479ce7c8171c76c679d75c10acf185c6d Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sat, 7 Dec 2019 07:47:40 +0100 Subject: Let's see if the error is verbosed --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index f178e9ac..0a4a4cb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,9 @@ matrix: - env: # 4. Only doxygen documentation - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' - # 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' + - 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: -- cgit v1.2.3 From e668d175dedf05dfcd04cb0cc0a6f0774d92cee6 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 9 Dec 2019 09:22:51 +0100 Subject: use 'ctest --output-on-failure' for unitary tests --- .appveyor.yml | 4 ++-- .circleci/config.yml | 13 +++++++++---- .travis.yml | 13 +++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) (limited to '.travis.yml') diff --git a/.appveyor.yml b/.appveyor.yml index 125f3cf4..4a76ea0a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -57,8 +57,8 @@ build_script: - if [%target%]==[Python] ( cd src/python & MSBuild Cython.sln /m /p:Configuration=Release /p:Platform=x64 & - ctest -j 1 -C Release + ctest -j 1 --output-on-failure -C Release ) else ( MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & - ctest -j 1 -C Release -E diff_files + ctest -j 1 --output-on-failure -C Release -E diff_files ) diff --git a/.circleci/config.yml b/.circleci/config.yml index 52cb3d45..5e45bc14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,8 @@ jobs: mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..; - make all test; + make all; + ctest --output-on-failure; tests: docker: @@ -24,7 +25,8 @@ jobs: mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF ..; - make all test; + make all; + ctest --output-on-failure; utils: docker: @@ -37,7 +39,8 @@ jobs: mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF ..; - make all test; + make all; + ctest --output-on-failure; python: docker: @@ -55,7 +58,9 @@ jobs: mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 ..; - make all test sphinx; + make all; + ctest --output-on-failure; + make sphinx; cp -R python/sphinx /tmp/sphinx; - store_artifacts: diff --git a/.travis.yml b/.travis.yml index 0a4a4cb8..51bc26c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,19 +13,19 @@ matrix: include: - env: # 1. Only examples and associated tests - - CMAKE_EXAMPLE='ON' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' + - CMAKE_EXAMPLE='ON' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='all' CTEST_COMMAND='ctest --output-on-failure' - env: # 2. Only unitary tests - - CMAKE_EXAMPLE='OFF' CMAKE_TEST='ON' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='ON' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='all' CTEST_COMMAND='ctest --output-on-failure' - env: # 3. Only utilities and associated tests - - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='ON' CMAKE_PYTHON='OFF' MAKE_TARGET='test' + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='ON' CMAKE_PYTHON='OFF' MAKE_TARGET='all' CTEST_COMMAND='ctest --output-on-failure' - env: # 4. Only doxygen documentation - - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' CTEST_COMMAND='echo No tests for doxygen target' - 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' + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='all sphinx' CTEST_COMMAND='ctest --output-on-failure' cache: directories: @@ -62,7 +62,8 @@ script: - mkdir -p build - cd build - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=${CMAKE_EXAMPLE} -DWITH_GUDHI_TEST=${CMAKE_TEST} -DWITH_GUDHI_UTILITIES=${CMAKE_UTILITIES} -DWITH_GUDHI_PYTHON=${CMAKE_PYTHON} -DUSER_VERSION_DIR=version -DPython_ADDITIONAL_VERSIONS=3 .. - - make all ${MAKE_TARGET} + - make ${MAKE_TARGET} + - ${CTEST_COMMAND} - cd .. notifications: -- cgit v1.2.3 From 406d7349a4732a185374822bf465f914e95d07c9 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 9 Dec 2019 11:11:00 +0100 Subject: Add some debug traces to find why sphinx fails --- .travis.yml | 3 ++- src/python/doc/python3-sphinx-build.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 51bc26c3..1c490b69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ matrix: - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' CTEST_COMMAND='echo No tests for doxygen target' - env: # 5. Only Python, associated tests and sphinx documentation - - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='all sphinx' CTEST_COMMAND='ctest --output-on-failure' + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='all' CTEST_COMMAND='ctest --output-on-failure' cache: directories: @@ -56,6 +56,7 @@ install: - python3 -m pip install --upgrade pip setuptools wheel - python3 -m pip install --user pytest Cython sphinx sphinxcontrib-bibtex sphinx-paramlinks matplotlib numpy scipy scikit-learn - python3 -m pip install --user POT + - which python3 script: - rm -rf build diff --git a/src/python/doc/python3-sphinx-build.py b/src/python/doc/python3-sphinx-build.py index 84d158cf..a8eede8a 100755 --- a/src/python/doc/python3-sphinx-build.py +++ b/src/python/doc/python3-sphinx-build.py @@ -5,6 +5,8 @@ Emulate sphinx-build for python3 """ from sys import exit, argv +print(sys.executable) +import sphinx from sphinx import main if __name__ == '__main__': -- cgit v1.2.3 From f51fbbcde2f09f977198acfb8aee557ba1bab793 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 9 Dec 2019 15:05:07 +0100 Subject: Hard set python path as cmake does not find the one used by the yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 1c490b69..96eb41ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ script: - rm -rf build - mkdir -p build - cd build - - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=${CMAKE_EXAMPLE} -DWITH_GUDHI_TEST=${CMAKE_TEST} -DWITH_GUDHI_UTILITIES=${CMAKE_UTILITIES} -DWITH_GUDHI_PYTHON=${CMAKE_PYTHON} -DUSER_VERSION_DIR=version -DPython_ADDITIONAL_VERSIONS=3 .. + - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=${CMAKE_EXAMPLE} -DWITH_GUDHI_TEST=${CMAKE_TEST} -DWITH_GUDHI_UTILITIES=${CMAKE_UTILITIES} -DWITH_GUDHI_PYTHON=${CMAKE_PYTHON} -DUSER_VERSION_DIR=version -DPYTHON_EXECUTABLE:FILEPATH=/usr/local/bin/python3 -DPython_ADDITIONAL_VERSIONS=3 .. - make ${MAKE_TARGET} - ${CTEST_COMMAND} - cd .. -- cgit v1.2.3 From 9f9663ccee928ba9d73c970e4e174aff9043bb76 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 9 Dec 2019 22:20:37 +0100 Subject: Add some comments of what fails and make the tests pass --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 96eb41ac..b7cd854a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,11 @@ matrix: - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' CTEST_COMMAND='echo No tests for doxygen target' - env: # 5. Only Python, associated tests and sphinx documentation - - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='all' CTEST_COMMAND='ctest --output-on-failure' + # $ which python3 => /usr/local/bin/python3 + # cmake => -- Found PythonInterp: /usr/local/bin/python3 (found version "3.7.5") + # In python3-sphinx-build.py, print(sys.executable) => /usr/local/opt/python/bin/python3.7 ??? + # should be : MAKE_TARGET='all sphinx' CTEST_COMMAND='ctest --output-on-failure' + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='all' CTEST_COMMAND='ctest --output-on-failure -E sphinx' cache: directories: @@ -62,7 +66,7 @@ script: - rm -rf build - mkdir -p build - cd build - - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=${CMAKE_EXAMPLE} -DWITH_GUDHI_TEST=${CMAKE_TEST} -DWITH_GUDHI_UTILITIES=${CMAKE_UTILITIES} -DWITH_GUDHI_PYTHON=${CMAKE_PYTHON} -DUSER_VERSION_DIR=version -DPYTHON_EXECUTABLE:FILEPATH=/usr/local/bin/python3 -DPython_ADDITIONAL_VERSIONS=3 .. + - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=${CMAKE_EXAMPLE} -DWITH_GUDHI_TEST=${CMAKE_TEST} -DWITH_GUDHI_UTILITIES=${CMAKE_UTILITIES} -DWITH_GUDHI_PYTHON=${CMAKE_PYTHON} -DUSER_VERSION_DIR=version -DPython_ADDITIONAL_VERSIONS=3 .. - make ${MAKE_TARGET} - ${CTEST_COMMAND} - cd .. -- cgit v1.2.3 From 4391bf38f14f483b9032e3eaf99f315f2f053026 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 10 Dec 2019 00:04:02 +0100 Subject: Remove debug traces --- .travis.yml | 1 - src/python/doc/python3-sphinx-build.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index b7cd854a..d6c82e70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,6 @@ install: - python3 -m pip install --upgrade pip setuptools wheel - python3 -m pip install --user pytest Cython sphinx sphinxcontrib-bibtex sphinx-paramlinks matplotlib numpy scipy scikit-learn - python3 -m pip install --user POT - - which python3 script: - rm -rf build diff --git a/src/python/doc/python3-sphinx-build.py b/src/python/doc/python3-sphinx-build.py index 3628e89e..d1f0f08e 100755 --- a/src/python/doc/python3-sphinx-build.py +++ b/src/python/doc/python3-sphinx-build.py @@ -4,8 +4,7 @@ Emulate sphinx-build for python3 """ -from sys import exit, argv, executable -print(executable) +from sys import exit, argv import sphinx from sphinx import main -- cgit v1.2.3