Changed the files appveyor and travis to previous values

2 files changed, 34 insertions, 43 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index e4382f02..6ed75cf7 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,21 +13,21 @@ environment:
   APPVEYOR_SAVE_CACHE_ON_ERROR: true
 
   matrix:
-#      - target: Examples
-#        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF
-#        PYTHON: "C:\\Python37-x64"
-#
+      - target: Examples
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF
+        PYTHON: "C:\\Python37-x64"
+
       - target: UnitaryTests
         CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF
         PYTHON: "C:\\Python37-x64"
-#
-#      - target: Utilities
-#        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF
-#        PYTHON: "C:\\Python37-x64"
-#
-#      - target: Python
-#        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
-#        PYTHON: "C:\\Python37-x64"
+
+      - target: Utilities
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF
+        PYTHON: "C:\\Python37-x64"
+
+      - target: Python
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
+        PYTHON: "C:\\Python37-x64"
 
 
 cache:
@@ -59,6 +59,5 @@ build_script:
       ctest -j 1 -C Release
     ) else (
       MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
-      cd src/Coxeter_triangulation/test/Release &
-      Coxeter_triangulation_manifold_tracing_test.exe "--report_level=detailed" "--log_level=all"
+      ctest -j 1 -C Release -E diff_files
     )
diff --git a/.travis.yml b/.travis.yml
index 83a12649..bf268057 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,47 +5,37 @@ sudo: required
 git: 
  depth: 3
 
+os: osx
+osx_image: xcode10.2
+compiler: clang
+
 matrix:
   include:
-    # A. Mac OSX
-    #- os: osx
-    #  osx_image: xcode9.4
-    #  compiler: clang
-    #  env:
-    #    # 1. Only examples and associated tests
-    #    - CMAKE_EXAMPLE='ON' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test'
-    - os: osx
-      osx_image: xcode9.4
-      compiler: clang
-      env:
+    - env:
+        # 1. Only examples and associated tests
+        - CMAKE_EXAMPLE='ON' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test'
+    - env:
         # 2. Only unitary tests
         - CMAKE_EXAMPLE='OFF' CMAKE_TEST='ON' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test'
-    #- os: osx
-    #  osx_image: xcode9.4
-    #  compiler: clang
-    #  env:
-    #    # 3. Only utilities and associated tests
-    #    - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='ON' CMAKE_PYTHON='OFF' MAKE_TARGET='test'
-    #- os: osx
-    #  osx_image: xcode9.4
-    #  compiler: clang
-    #  env:
-    #    # 4. Only doxygen documentation
-    #    - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen'
+    - env:
+        # 3. Only utilities and associated tests
+        - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='ON' CMAKE_PYTHON='OFF' MAKE_TARGET='test'
+    - 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
-    # - os: osx
-    #   osx_image: xcode9.4
-    #   compiler: clang
-    #   env:
+    # - 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:
     - $HOME/.cache/pip
+    - $HOME/Library/Caches/Homebrew
 
 addons:
   homebrew:
+    update: true
     packages:
       - cmake
       - graphviz 
@@ -58,18 +48,20 @@ addons:
       - cgal
       - python3
 
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
+  - brew cleanup
+
 # 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 matplotlib numpy scipy
-  - python3 -m pip install --user POT
 
 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 .. 
-  - ctest -R Coxeter_triangulation_manifold_tracing_test -V
   - make all ${MAKE_TARGET}
   - cd ..