From eae4534638cd0c152fbe42fa62ec3c638c05e214 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 28 May 2020 07:20:54 +0200 Subject: Let's try to fix sphinx compilationon Osx and Win --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'azure-pipelines.yml') diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7b5334a7..29ec23d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,5 +33,5 @@ jobs: cmake -DCMAKE_BUILD_TYPE:STRING=$(cmakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 .. make -j 4 make doxygen - ctest -j 4 --output-on-failure -E sphinx # remove sphinx build as it fails + ctest -j 4 --output-on-failure # -E sphinx remove sphinx build as it fails displayName: 'Build, test and documentation generation' -- cgit v1.2.3 From 0dfe5025dcfb1ac1db4e74394f7d7aa917ec8721 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 28 May 2020 08:33:16 +0200 Subject: remove sphinx test on azure and apveyor --- .appveyor.yml | 2 +- azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'azure-pipelines.yml') diff --git a/.appveyor.yml b/.appveyor.yml index d072a366..d48ec43e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -59,7 +59,7 @@ build_script: - if [%target%]==[Python] ( cd src/python & MSBuild Cython.sln /m /p:Configuration=Release /p:Platform=x64 & - ctest -j 1 --output-on-failure -C Release + ctest -j 1 --output-on-failure -C Release -E sphinx ) else ( MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & ctest -j 1 --output-on-failure -C Release -E diff_files diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 29ec23d0..7b5334a7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,5 +33,5 @@ jobs: cmake -DCMAKE_BUILD_TYPE:STRING=$(cmakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 .. make -j 4 make doxygen - ctest -j 4 --output-on-failure # -E sphinx remove sphinx build as it fails + ctest -j 4 --output-on-failure -E sphinx # remove sphinx build as it fails displayName: 'Build, test and documentation generation' -- cgit v1.2.3 From 20e57ccc35ef216bec5b1252b41a4aa1da566610 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 28 May 2020 10:59:36 +0200 Subject: Let's try this --- .appveyor.yml | 2 +- azure-pipelines.yml | 2 +- src/cmake/modules/GUDHI_third_party_libraries.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'azure-pipelines.yml') diff --git a/.appveyor.yml b/.appveyor.yml index d48ec43e..d072a366 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -59,7 +59,7 @@ build_script: - if [%target%]==[Python] ( cd src/python & MSBuild Cython.sln /m /p:Configuration=Release /p:Platform=x64 & - ctest -j 1 --output-on-failure -C Release -E sphinx + ctest -j 1 --output-on-failure -C Release ) else ( MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & ctest -j 1 --output-on-failure -C Release -E diff_files diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7b5334a7..29ec23d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,5 +33,5 @@ jobs: cmake -DCMAKE_BUILD_TYPE:STRING=$(cmakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 .. make -j 4 make doxygen - ctest -j 4 --output-on-failure -E sphinx # remove sphinx build as it fails + ctest -j 4 --output-on-failure # -E sphinx remove sphinx build as it fails displayName: 'Build, test and documentation generation' diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index 49295a82..f92fe93e 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -199,7 +199,7 @@ if(PYTHONINTERP_FOUND AND CYTHON_FOUND) if(NOT SPHINX_PATH) if(PYTHON_VERSION_MAJOR EQUAL 3) # In Python3, just hack sphinx-build if it does not exist - set(SPHINX_PATH "${PYTHON_EXECUTABLE}" "-m sphinx.cmd.build") + set(SPHINX_PATH "${PYTHON_EXECUTABLE}" "-m" "sphinx.cmd.build") endif(PYTHON_VERSION_MAJOR EQUAL 3) endif(NOT SPHINX_PATH) endif(SPHINX_FOUND) -- cgit v1.2.3 From c9ba857c4637b9797dd77effd3d434b03135224e Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 09:19:57 +0200 Subject: Try with 10.15 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'azure-pipelines.yml') diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 29ec23d0..48291fbc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,7 +5,7 @@ jobs: timeoutInMinutes: 0 cancelTimeoutInMinutes: 60 pool: - vmImage: macOS-10.14 + vmImage: macOS-10.15 variables: pythonVersion: '3.6' cmakeBuildType: Release -- cgit v1.2.3 From 250eb63a0424773344e6ada290dc42a4f5cee67b Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 10:46:19 +0200 Subject: Do not pay attention to brew installation result --- .github/workflows/pip-packaging-osx.yml | 3 ++- azure-pipelines.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'azure-pipelines.yml') diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 85c3c807..c94369ac 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -22,7 +22,8 @@ jobs: architecture: x64 - name: Install dependencies run: | - brew update && brew install boost eigen gmp mpfr cgal + brew update || true + brew install boost eigen gmp mpfr cgal || true python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine delocate - name: Build python wheel diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48291fbc..8e88cab5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,6 @@ jobs: variables: pythonVersion: '3.6' cmakeBuildType: Release - customInstallation: 'brew update && brew install graphviz doxygen boost eigen gmp mpfr tbb cgal' steps: - bash: echo "##vso[task.prependpath]$CONDA/bin" @@ -23,7 +22,8 @@ jobs: sudo conda install --yes --quiet --name gudhi_build_env python=$(pythonVersion) python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt - $(customInstallation) + brew update || true + brew install graphviz doxygen boost eigen gmp mpfr tbb cgal || true displayName: 'Install build dependencies' - bash: | source activate gudhi_build_env -- cgit v1.2.3