Merge pull request #329 from VincentRouvreau/use_requirements_for_appveyor

use requirements file for appveyor

5 files changed, 6 insertions, 19 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 34f42dea..d072a366 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -48,8 +48,9 @@ install:
   - python --version
   - pip --version
   - python -m pip install --upgrade pip
-  - pip install -U setuptools numpy matplotlib scipy Cython pytest
-  - pip install -U POT pybind11
+  - python -m pip install --user -r .github/build-requirements.txt
+  # No PyKeOps on windows, let's workaround this one.
+  - for /F "tokens=*" %%A in (.github/test-requirements.txt) do python -m pip install --user  %%A
 
 build_script:
   - mkdir build
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 0abe66b7..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}" "${CMAKE_CURRENT_SOURCE_DIR}/${GUDHI_PYTHON_PATH}/doc/python3-sphinx-build.py")
+        set(SPHINX_PATH "${PYTHON_EXECUTABLE}" "-m" "sphinx.cmd.build")
       endif(PYTHON_VERSION_MAJOR EQUAL 3)
     endif(NOT SPHINX_PATH)
   endif(SPHINX_FOUND)
diff --git a/src/python/doc/nerve_gic_complex_user.rst b/src/python/doc/nerve_gic_complex_user.rst
index 0e67fc78..0b820abf 100644
--- a/src/python/doc/nerve_gic_complex_user.rst
+++ b/src/python/doc/nerve_gic_complex_user.rst
@@ -50,7 +50,7 @@ The cover C comes from the preimages of intervals (10 intervals with gain 0.3)
 covering the height function (coordinate 2),
 which are then refined into their connected components using the triangulation of the .OFF file.
 
-.. testcode::
+.. code-block:: python
 
     import gudhi
     nerve_complex = gudhi.CoverComplex()
@@ -99,9 +99,6 @@ the program output is:
       [-0.171433, 0.367393]
       [-0.909111, 0.745853]
     0 interval(s) in dimension 1:
-
-.. testoutput::
-
     Nerve is of dimension 1 - 41 simplices - 21 vertices.
     [0]
     [1]
diff --git a/src/python/doc/python3-sphinx-build.py b/src/python/doc/python3-sphinx-build.py
deleted file mode 100755
index 84d158cf..00000000
--- a/src/python/doc/python3-sphinx-build.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Emulate sphinx-build for python3
-"""
-
-from sys import exit, argv
-from sphinx import main
-
-if __name__ == '__main__':
-    exit(main(argv))