From 8afbdce4e57c18b3d7b8075d5711f669516e633c Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Wed, 22 May 2019 22:23:46 +0200
Subject: Try to fix compilation

---
 .appveyor.yml | 69 -----------------------------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 .appveyor.yml

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 86199265..00000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Specify version format
-version: "{build}"
-
-image:
-  - Visual Studio 2017
-
-platform:
-  - x64
-
-# specify custom environment variables
-environment:
-  APPVEYOR_SAVE_CACHE_ON_ERROR: true
-
-# build configuration, i.e. Debug, Release, etc.
-configuration:
-  - Debug
-  - Release
-
-# scripts that are called at very beginning, before repo cloning
-init:
-  - cmd: cmake --version
-  - cmd: msbuild /version
-
-# scripts that run after cloning repository
-install:
-  #------------------
-  # Windows 10
-  #------------------
-  # update vcpkg
-  - cmd: cd C:\tools\vcpkg
-  - cmd: git pull
-  - cmd: .\bootstrap-vcpkg.bat
-
-  - cmd: if "%platform%"=="Win32" set VCPKG_ARCH=x86-windows
-  - cmd: if "%platform%"=="x64"   set VCPKG_ARCH=x64-windows
-
-  # remove outdated versions
-  - cmd: vcpkg remove --outdated --recurse
-
-  # install required dependencies
-  - cmd: vcpkg install --recurse --triplet %VCPKG_ARCH% zlib boost-date-time boost-program-options boost-system boost-serialization boost-thread boost-units tbb eigen3 cgal[core]
-
-  - cmd: vcpkg integrate install
-  - cmd: cd "%APPVEYOR_BUILD_FOLDER%"
-
-# preserve contents of selected directories and files across project builds
-for:
--
-  matrix:
-    only:
-      - image: Visual Studio 2017
-  cache:
-    - 'C:\tools\vcpkg\installed'
-
-build_script:
-  # get VCG library
-  - git clone https://github.com/GUDHI/gudhi-devel.git
-
-  #------------------
-  # Windows 10
-  #------------------
-  - cmd: if "%platform%"=="Win32" set CMAKE_GENERATOR=-G"Visual Studio 15 2017"
-  - cmd: if "%platform%"=="x64"   set CMAKE_GENERATOR=-G"Visual Studio 15 2017 Win64"
-  - cmd: mkdir build && cd build
-  - cmd: cmake %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=%Configuration% -DCMAKE_TOOLCHAIN_FILE="C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCG_ROOT="%APPVEYOR_BUILD_FOLDER%\VCG" ..
-  - cmd: cmake --build . --target ALL_BUILD --config %Configuration% -- /maxcpucount:4
-
-test_script:
-  - cmd: ctest --build-config %Configuration% --output-on-failure
-- 
cgit v1.2.3


From e7e7d844c7c0bc6cfc21e0cce21ee678974ed3ec Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 10:02:31 +0200
Subject: Test appveyor

---
 .appveyor.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 .appveyor.yml

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 00000000..688ea721
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,44 @@
+image:
+  - Visual Studio 2017
+
+build:
+  parallel: true
+  verbosity: detailed
+
+configuration:
+  - Release
+
+environment:
+  # update the vcpkg cache even if build fails
+  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
+
+      - target: UnitaryTests
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF
+
+      - target: Utilities
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF
+
+      - target: Python
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
+
+cache:
+  - c:\Tools\vcpkg\installed
+  - '%LOCALAPPDATA%\pip\Cache'
+
+init:
+  - echo %target%
+
+install:
+  - vcpkg install eigen3:x64-windows cgal:x64-windows
+  - pip install -U setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
+
+build_script:
+  - mkdir build
+  - cd build
+  - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
+  - cmake --build . --config Release
+  - cmake --build . --config Release --target check
-- 
cgit v1.2.3


From 5006d0d0a84f406b4580cf76ff7f3a0b5436bad4 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 10:25:34 +0200
Subject: Add boost program option

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 688ea721..6a3fa5d6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -33,7 +33,7 @@ init:
   - echo %target%
 
 install:
-  - vcpkg install eigen3:x64-windows cgal:x64-windows
+  - vcpkg install boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
   - pip install -U setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
 
 build_script:
-- 
cgit v1.2.3


From f207bb43ff379e343f7aae070139f38327980d97 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 11:08:26 +0200
Subject: Add all boost dependencies

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 6a3fa5d6..8624ffd9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -33,7 +33,7 @@ init:
   - echo %target%
 
 install:
-  - vcpkg install boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
+  - vcpkg install boost-serialization:x64-windows boost-datetime:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-unit_test_framework:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
   - pip install -U setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
 
 build_script:
-- 
cgit v1.2.3


From 1e487b39e2c6f0472b7664603bee3eaed6c4aa81 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 11:39:08 +0200
Subject: Fix boost packages name. Add tbb

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 8624ffd9..ab84af0c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -33,7 +33,7 @@ init:
   - echo %target%
 
 install:
-  - vcpkg install boost-serialization:x64-windows boost-datetime:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-unit_test_framework:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
+  - vcpkg install tbb:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
   - pip install -U setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
 
 build_script:
-- 
cgit v1.2.3


From ff5b66c799d61b2a955b69b7012e1cee5a13d12e Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 14:10:43 +0200
Subject: Add all boost disjoint sets

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index ab84af0c..25851a9b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -33,7 +33,7 @@ init:
   - echo %target%
 
 install:
-  - vcpkg install tbb:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
+  - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
   - pip install -U setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
 
 build_script:
-- 
cgit v1.2.3


From 2e8c95466559e7d10be30b101533079561ceee52 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 15:28:37 +0200
Subject: explicit msbuild and ctest command

---
 .appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 25851a9b..6affb88f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -40,5 +40,5 @@ build_script:
   - mkdir build
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-  - cmake --build . --config Release
-  - cmake --build . --config Release --target check
+  - MSBuild /m /p:Configuration=Release /p:Platform=x64
+  - ctest -j 1 -C Release
-- 
cgit v1.2.3


From 711e7d2e7ff907ead60d2ff11357bfad2293f506 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 15:33:46 +0200
Subject: Missing solution file for msbuild

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 6affb88f..d3d3e25e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -40,5 +40,5 @@ build_script:
   - mkdir build
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-  - MSBuild /m /p:Configuration=Release /p:Platform=x64
+  - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
   - ctest -j 1 -C Release
-- 
cgit v1.2.3


From 433a12c0fd70af56b1464eb79aaad748080c579a Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 16:49:07 +0200
Subject: Exclude diff_files test as it makes them fail with git/diff.exe

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index d3d3e25e..95dc7a3e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -41,4 +41,4 @@ build_script:
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
   - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
-  - ctest -j 1 -C Release
+  - ctest -j 1 -C Release -E diff_files
-- 
cgit v1.2.3


From 57d63634e54c1316bd150a10298a61c41b904429 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 17:41:27 +0200
Subject: Try to fix python compilation and tests

---
 .appveyor.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 95dc7a3e..fe9c7a8e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -40,5 +40,8 @@ build_script:
   - mkdir build
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-  - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
-  - ctest -j 1 -C Release -E diff_files
+  - if NOT "%target%"=="Python" MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
+  - if NOT "%target%"=="Python" ctest -j 1 -C Release -E diff_files
+  - if "%target%"=="Python" cd src/cython
+  - if "%target%"=="Python" python setup.py install
+  - if "%target%"=="Python" MSBuild RUN_TESTS.vcxproj
-- 
cgit v1.2.3


From 98b36e59d53c92e4e857dab4d8957b7b2ec38895 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 23:45:55 +0200
Subject: Fix Python version

---
 .appveyor.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index fe9c7a8e..6c6a90bc 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,6 +24,10 @@ environment:
 
       - target: Python
         CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
+        PYTHON: "C:\\Python36"
+        PYTHON_VERSION: 3.6
+        PYTHON_ARCH: 64
+
 
 cache:
   - c:\Tools\vcpkg\installed
@@ -31,10 +35,14 @@ cache:
 
 init:
   - echo %target%
+  - ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%
+
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
-  - pip install -U setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
+  - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+  - python --version
+  - python -m pip install -U pip setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
 
 build_script:
   - mkdir build
-- 
cgit v1.2.3


From 251fa3c248e3a02aba5a047b9c63b303d81e5158 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 23:52:02 +0200
Subject: Fix Python version

---
 .appveyor.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 6c6a90bc..3f294bc8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,9 +24,7 @@ environment:
 
       - target: Python
         CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
-        PYTHON: "C:\\Python36"
-        PYTHON_VERSION: 3.6
-        PYTHON_ARCH: 64
+        PYTHON: "C:\Python36-x64"
 
 
 cache:
@@ -35,12 +33,11 @@ cache:
 
 init:
   - echo %target%
-  - ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%
 
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
-  - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+  - SET PATH=%PYTHON%;%path%
   - python --version
   - python -m pip install -U pip setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
 
-- 
cgit v1.2.3


From 96101771c99ae4621836e4197df705213af59316 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 23:55:37 +0200
Subject: Fix Python version

---
 .appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 3f294bc8..4b051121 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,7 +24,7 @@ environment:
 
       - target: Python
         CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
-        PYTHON: "C:\Python36-x64"
+        PYTHON_VERSION: "3.7"
 
 
 cache:
@@ -37,7 +37,7 @@ init:
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
-  - SET PATH=%PYTHON%;%path%
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - python --version
   - python -m pip install -U pip setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
 
-- 
cgit v1.2.3


From b9cff059675eecbd678be8ed31d25aca79cea040 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 24 May 2019 23:58:49 +0200
Subject: Fix Python version

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 4b051121..c481f7f3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,7 +24,7 @@ environment:
 
       - target: Python
         CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
-        PYTHON_VERSION: "3.7"
+        PYTHON: "C:\\Python36-x64"
 
 
 cache:
-- 
cgit v1.2.3


From 60125bf31053e77d1f5b9f799b50e1abbc5c8cdd Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Sat, 25 May 2019 00:00:05 +0200
Subject: Fix Python version

---
 .appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index c481f7f3..9f10ae1d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -38,8 +38,8 @@ init:
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - python --version
-  - python -m pip install -U pip setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
+  - python3 --version
+  - python3 -m pip install -U pip setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
 
 build_script:
   - mkdir build
@@ -48,5 +48,5 @@ build_script:
   - if NOT "%target%"=="Python" MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
   - if NOT "%target%"=="Python" ctest -j 1 -C Release -E diff_files
   - if "%target%"=="Python" cd src/cython
-  - if "%target%"=="Python" python setup.py install
+  - if "%target%"=="Python" python3 setup.py install
   - if "%target%"=="Python" MSBuild RUN_TESTS.vcxproj
-- 
cgit v1.2.3


From 8a273e6cd05113ea70117800978d18f4f9ba351f Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Sat, 25 May 2019 00:08:11 +0200
Subject: Fix Python version

---
 .appveyor.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 9f10ae1d..1334004b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -37,9 +37,8 @@ init:
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - python3 --version
-  - python3 -m pip install -U pip setuptools numpy matplotlib scipy Cython pytest sphinx sphinxcontrib-bibtex
+  - if "%target%"=="Python" "%PYTHON%\\python.exe --version"
+  - if "%target%"=="Python" "%PYTHON%\\python.exe -m pip install -U pip setuptools numpy matplotlib scipy Cython pytest"
 
 build_script:
   - mkdir build
@@ -48,5 +47,5 @@ build_script:
   - if NOT "%target%"=="Python" MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
   - if NOT "%target%"=="Python" ctest -j 1 -C Release -E diff_files
   - if "%target%"=="Python" cd src/cython
-  - if "%target%"=="Python" python3 setup.py install
+  - if "%target%"=="Python" "%PYTHON%\\python.exe setup.py install"
   - if "%target%"=="Python" MSBuild RUN_TESTS.vcxproj
-- 
cgit v1.2.3


From 248452f0958f52185e702bccac2cf1f7e156e159 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Mon, 27 May 2019 10:56:49 +0200
Subject: Let's try to fix conditional python

---
 .appveyor.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 1334004b..3cf5d71b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,7 +24,7 @@ environment:
 
       - target: Python
         CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
-        PYTHON: "C:\\Python36-x64"
+        PYTHON: "C:\\Python37-x64"
 
 
 cache:
@@ -37,15 +37,21 @@ init:
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
-  - if "%target%"=="Python" "%PYTHON%\\python.exe --version"
-  - if "%target%"=="Python" "%PYTHON%\\python.exe -m pip install -U pip setuptools numpy matplotlib scipy Cython pytest"
+  - if [%target%]==[Python] (
+      SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+      python --version
+      pip version
+      pip install -U setuptools numpy matplotlib scipy Cython pytest )
 
 build_script:
   - mkdir build
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-  - if NOT "%target%"=="Python" MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
-  - if NOT "%target%"=="Python" ctest -j 1 -C Release -E diff_files
-  - if "%target%"=="Python" cd src/cython
-  - if "%target%"=="Python" "%PYTHON%\\python.exe setup.py install"
-  - if "%target%"=="Python" MSBuild RUN_TESTS.vcxproj
+  - if [%target%]==[Python] (
+      cd src/cython
+      python setup.py install
+      MSBuild RUN_TESTS.vcxproj
+    ) else (
+      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
+      ctest -j 1 -C Release -E diff_files
+    )
-- 
cgit v1.2.3


From 5a9a00430798732c122e9a8ff98890aaa30a79dc Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Mon, 27 May 2019 11:04:57 +0200
Subject: Let's try to fix conditional

---
 .appveyor.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 3cf5d71b..6e999458 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -38,9 +38,9 @@ init:
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
   - if [%target%]==[Python] (
-      SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
-      python --version
-      pip version
+      SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% &
+      python --version &
+      pip version &
       pip install -U setuptools numpy matplotlib scipy Cython pytest )
 
 build_script:
@@ -48,10 +48,10 @@ build_script:
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
   - if [%target%]==[Python] (
-      cd src/cython
-      python setup.py install
+      cd src/cython &
+      python setup.py install &
       MSBuild RUN_TESTS.vcxproj
     ) else (
-      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
+      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
       ctest -j 1 -C Release -E diff_files
     )
-- 
cgit v1.2.3


From 130bd5718dc4c880665b893feb5219f806bceef0 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Mon, 27 May 2019 11:16:52 +0200
Subject: Let's try to fix conditional

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 6e999458..21f83f74 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,7 +24,7 @@ environment:
 
       - target: Python
         CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
-        PYTHON: "C:\\Python37-x64"
+        PYTHON: "C:\\Python36-x64"
 
 
 cache:
-- 
cgit v1.2.3


From 2bd43179e588e0b653eb4cf47613e49dc3ac20a9 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 10:27:08 +0200
Subject: Rollback Python 3.7

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 21f83f74..6e999458 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,7 +24,7 @@ environment:
 
       - target: Python
         CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
-        PYTHON: "C:\\Python36-x64"
+        PYTHON: "C:\\Python37-x64"
 
 
 cache:
-- 
cgit v1.2.3


From ba4adc5711c540f5ec8de7fc863058e241ce84d2 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 11:26:24 +0200
Subject: Let's try to fix batch error

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 6e999458..d664f9e5 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -38,7 +38,7 @@ init:
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
   - if [%target%]==[Python] (
-      SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% &
+      SET PATH="%PYTHON%;%PYTHON%\\Scripts;%PATH%" &
       python --version &
       pip version &
       pip install -U setuptools numpy matplotlib scipy Cython pytest )
-- 
cgit v1.2.3


From d2f5c92ab23a326f580ea12f8740f1e117691ee2 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 13:05:27 +0200
Subject: Let's fix Python only

---
 .appveyor.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index d664f9e5..5d8e6125 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,14 +13,17 @@ 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
-
-      - target: UnitaryTests
-        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF
-
-      - target: Utilities
-        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF
+#      - 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
@@ -37,11 +40,10 @@ init:
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
-  - if [%target%]==[Python] (
-      SET PATH="%PYTHON%;%PYTHON%\\Scripts;%PATH%" &
-      python --version &
-      pip version &
-      pip install -U setuptools numpy matplotlib scipy Cython pytest )
+  - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+  - if [%target%]==[Python] ( python --version &
+                              pip version &
+                              pip install -U setuptools numpy matplotlib scipy Cython pytest )
 
 build_script:
   - mkdir build
-- 
cgit v1.2.3


From 53867c45f517ba3d1d81526f42c8cd3c8725c5c1 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 13:07:21 +0200
Subject: Let's fix pip version

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 5d8e6125..0ba6c728 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -42,7 +42,7 @@ install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
   - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
   - if [%target%]==[Python] ( python --version &
-                              pip version &
+                              pip --version &
                               pip install -U setuptools numpy matplotlib scipy Cython pytest )
 
 build_script:
-- 
cgit v1.2.3


From 72b0fca579c2d7864b9d1984fe362337853e6f25 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 13:25:56 +0200
Subject: Update pip

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 0ba6c728..4e819d1f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -43,7 +43,7 @@ install:
   - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
   - if [%target%]==[Python] ( python --version &
                               pip --version &
-                              pip install -U setuptools numpy matplotlib scipy Cython pytest )
+                              pip install -U pip setuptools numpy matplotlib scipy Cython pytest )
 
 build_script:
   - mkdir build
-- 
cgit v1.2.3


From 3b62b431e4bbc8ba0e5a5f051ec480b2a16ac35f Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 13:29:47 +0200
Subject: Add vcvarsall.bat for cython

---
 .appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 4e819d1f..bfea1b94 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -41,6 +41,7 @@ init:
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
   - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
   - if [%target%]==[Python] ( python --version &
                               pip --version &
                               pip install -U pip setuptools numpy matplotlib scipy Cython pytest )
-- 
cgit v1.2.3


From e0bc768023df268ed7f4c5541e41f63b1c7dc57b Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 13:32:32 +0200
Subject: Add vcvarsall.bat for cython

---
 .appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index bfea1b94..ddc9e74c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -44,7 +44,8 @@ install:
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
   - if [%target%]==[Python] ( python --version &
                               pip --version &
-                              pip install -U pip setuptools numpy matplotlib scipy Cython pytest )
+                              python -m pip install --upgrade pip &
+                              pip install -U setuptools numpy matplotlib scipy Cython pytest )
 
 build_script:
   - mkdir build
-- 
cgit v1.2.3


From 5a1620655f6c0490b54bb8ebc2dad919052a2fe3 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 15:26:42 +0200
Subject: Add mpfr

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index ddc9e74c..742b02a4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -39,7 +39,7 @@ init:
 
 
 install:
-  - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows cgal:x64-windows
+  - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows
   - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
   - if [%target%]==[Python] ( python --version &
-- 
cgit v1.2.3


From a227bc0be7c5ee70ff45f6ee06da9be0553b1937 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 May 2019 16:17:31 +0200
Subject: Add mpfr directories for cmake

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 742b02a4..294744b1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,7 +26,7 @@ environment:
 #        PYTHON: "C:\\Python37-x64"
 
       - target: Python
-        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DMPFR_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DMPFR_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib"
         PYTHON: "C:\\Python37-x64"
 
 
-- 
cgit v1.2.3


From 84e40389f77bdb0a614efb947469d8920c723738 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Wed, 5 Jun 2019 11:06:04 +0200
Subject: Add some debug traces

---
 .appveyor.yml             | 11 ++++++-----
 src/cython/CMakeLists.txt |  6 ++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 294744b1..1048328e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,7 +26,7 @@ environment:
 #        PYTHON: "C:\\Python37-x64"
 
       - target: Python
-        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DMPFR_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DMPFR_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib"
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib"
         PYTHON: "C:\\Python37-x64"
 
 
@@ -42,10 +42,10 @@ install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows
   - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-  - if [%target%]==[Python] ( python --version &
-                              pip --version &
-                              python -m pip install --upgrade pip &
-                              pip install -U setuptools numpy matplotlib scipy Cython pytest )
+  - python --version
+  - pip --version
+  - python -m pip install --upgrade pip
+  - pip install -U setuptools numpy matplotlib scipy Cython pytest )
 
 build_script:
   - mkdir build
@@ -53,6 +53,7 @@ build_script:
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
   - if [%target%]==[Python] (
       cd src/cython &
+      Type setup.py &
       python setup.py install &
       MSBuild RUN_TESTS.vcxproj
     ) else (
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index 480332d7..d4ace20e 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -138,6 +138,7 @@ if(PYTHONINTERP_FOUND)
         else()
           add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_RELEASE}")
         endif()
+        message("** Add Boost ${Boost_LIBRARY_DIRS}")
         set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ")
       endif()
       # Add CGAL compilation args
@@ -148,6 +149,7 @@ if(PYTHONINTERP_FOUND)
         add_gudhi_debug_info("CGAL version ${CGAL_VERSION}")
         add_gudhi_cython_lib("${CGAL_LIBRARY}")
         set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ")
+        message("** Add CGAL ${CGAL_LIBRARIES_DIR}")
         # If CGAL is not header only, CGAL library may link with boost system,
         if(CMAKE_BUILD_TYPE MATCHES Debug)
           add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_DEBUG}")
@@ -155,6 +157,7 @@ if(PYTHONINTERP_FOUND)
           add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_RELEASE}")
         endif()
         set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ")
+        message("** Add Boost ${Boost_LIBRARY_DIRS}")
       endif(CGAL_HEADER_ONLY)
       # GMP and GMPXX are not required, but if present, CGAL will link with them.
       if(GMP_FOUND)
@@ -162,11 +165,13 @@ if(PYTHONINTERP_FOUND)
         set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMP', ")
         add_gudhi_cython_lib("${GMP_LIBRARIES}")
         set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ")
+        message("** Add gmp ${GMP_LIBRARIES_DIR}")
         if(GMPXX_FOUND)
           add_gudhi_debug_info("GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}")
           set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMPXX', ")
           add_gudhi_cython_lib("${GMPXX_LIBRARIES}")
           set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMPXX_LIBRARIES_DIR}', ")
+        message("** Add gmpxx ${GMPXX_LIBRARIES_DIR}")
         endif(GMPXX_FOUND)
       endif(GMP_FOUND)
     endif(CGAL_FOUND)
@@ -195,6 +200,7 @@ if(PYTHONINTERP_FOUND)
         add_gudhi_cython_lib("${TBB_MALLOC_RELEASE_LIBRARY}")
       endif()
       set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${TBB_LIBRARY_DIRS}', ")
+      message("** Add tbb ${TBB_LIBRARY_DIRS}")
       set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${TBB_INCLUDE_DIRS}', ")
     endif()
 
-- 
cgit v1.2.3


From f676adcda7304bf29a50f5f010cdaa443ea2d2d3 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Wed, 5 Jun 2019 11:43:38 +0200
Subject: Typo

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 1048328e..0b10454f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -45,7 +45,7 @@ install:
   - python --version
   - pip --version
   - python -m pip install --upgrade pip
-  - pip install -U setuptools numpy matplotlib scipy Cython pytest )
+  - pip install -U setuptools numpy matplotlib scipy Cython pytest
 
 build_script:
   - mkdir build
-- 
cgit v1.2.3


From 55ddac99e964b21880604f41be938dc5eb990aa2 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Wed, 5 Jun 2019 11:49:36 +0200
Subject: Add CMake tag for gmp library directory

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 0b10454f..b0396d8b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,7 +26,7 @@ environment:
 #        PYTHON: "C:\\Python37-x64"
 
       - target: Python
-        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib"
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib"
         PYTHON: "C:\\Python37-x64"
 
 
-- 
cgit v1.2.3


From 4cb49545685c8eee54bd6e77ad8212516674799d Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Wed, 5 Jun 2019 22:07:01 +0200
Subject: Print gudhi version to see if well installed

---
 .appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index b0396d8b..e352d09a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -55,6 +55,7 @@ build_script:
       cd src/cython &
       Type setup.py &
       python setup.py install &
+      python -c "import gudhi; print(gudhi.__version__)" &
       MSBuild RUN_TESTS.vcxproj
     ) else (
       MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
-- 
cgit v1.2.3


From f79f39561b1ba239157774190c2a3ddb9c69d9fd Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Wed, 5 Jun 2019 22:24:01 +0200
Subject: Add debug traces and set PYTHONPATH

---
 .appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index e352d09a..1595f0a5 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -41,6 +41,9 @@ init:
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows
   - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+  - "ECHO %PYTHON%"
+  - SET PYTHONPATH=%PYTHON%\\Lib\\site-packages;%PYTHONPATH%
+  - "ECHO %PYTHONPATH%"
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
   - python --version
   - pip --version
-- 
cgit v1.2.3


From c60b439d7c609a93e1efcfce558f34744121391b Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Wed, 5 Jun 2019 22:37:49 +0200
Subject: Add debug traces and set PYTHONPATH

---
 .appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 1595f0a5..0d834aa8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -55,6 +55,7 @@ build_script:
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
   - if [%target%]==[Python] (
+      ECHO %PYTHONPATH% &
       cd src/cython &
       Type setup.py &
       python setup.py install &
-- 
cgit v1.2.3


From 02df78ee81ccb3a080ce37eab709f92e14bd8f29 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Thu, 6 Jun 2019 09:14:05 +0200
Subject: Add debug traces

---
 .appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 0d834aa8..492d1677 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -59,6 +59,7 @@ build_script:
       cd src/cython &
       Type setup.py &
       python setup.py install &
+      DIR %PYTHON%\\Lib\\site-packages &
       python -c "import gudhi; print(gudhi.__version__)" &
       MSBuild RUN_TESTS.vcxproj
     ) else (
-- 
cgit v1.2.3


From b9ddc3b6f1501fc15e84a8bea5927adae6623e5a Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Thu, 6 Jun 2019 09:34:17 +0200
Subject: Let's try this fix from support team

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 492d1677..dea0fc15 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -40,7 +40,7 @@ init:
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows
-  - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+  - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH%
   - "ECHO %PYTHON%"
   - SET PYTHONPATH=%PYTHON%\\Lib\\site-packages;%PYTHONPATH%
   - "ECHO %PYTHONPATH%"
-- 
cgit v1.2.3


From 456eadd7e6da04c6d35f02a79d3aa78e5d7bc970 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 09:49:23 +0200
Subject: Comment what fails

---
 .appveyor.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index dea0fc15..e481c62f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -41,9 +41,7 @@ init:
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows
   - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH%
-  - "ECHO %PYTHON%"
   - SET PYTHONPATH=%PYTHON%\\Lib\\site-packages;%PYTHONPATH%
-  - "ECHO %PYTHONPATH%"
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
   - python --version
   - pip --version
@@ -57,11 +55,9 @@ build_script:
   - if [%target%]==[Python] (
       ECHO %PYTHONPATH% &
       cd src/cython &
-      Type setup.py &
       python setup.py install &
-      DIR %PYTHON%\\Lib\\site-packages &
-      python -c "import gudhi; print(gudhi.__version__)" &
-      MSBuild RUN_TESTS.vcxproj
+      ECHO This fails : python -c "import gudhi; print(gudhi.__version__)" &
+      ECHO This fails : MSBuild RUN_TESTS.vcxproj
     ) else (
       MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
       ctest -j 1 -C Release -E diff_files
-- 
cgit v1.2.3


From 1d299f3f21bf5f4acc4e8d19cf3dcde6c3045133 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 09:59:36 +0200
Subject: Seperate build and tests

---
 .appveyor.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index e481c62f..82520c40 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -56,9 +56,16 @@ build_script:
       ECHO %PYTHONPATH% &
       cd src/cython &
       python setup.py install &
-      ECHO This fails : python -c "import gudhi; print(gudhi.__version__)" &
-      ECHO This fails : MSBuild RUN_TESTS.vcxproj
     ) else (
       MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
-      ctest -j 1 -C Release -E diff_files
     )
+
+test_script:
+  - cd build
+  - if [%target%]==[Python] (
+      cd src/cython &
+      python -c "import gudhi; print(gudhi.__version__)" &
+      ECHO MSBuild RUN_TESTS.vcxproj
+    ) else (
+      ctest -j 1 -C Release -E diff_files
+    )
\ No newline at end of file
-- 
cgit v1.2.3


From b8185dff1a17a7101b043554a1bf688366c377de Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 10:18:52 +0200
Subject: fix typo

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 82520c40..22c204b6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -55,7 +55,7 @@ build_script:
   - if [%target%]==[Python] (
       ECHO %PYTHONPATH% &
       cd src/cython &
-      python setup.py install &
+      python setup.py install
     ) else (
       MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
     )
-- 
cgit v1.2.3


From 2180529dd41471f08da8ccfb026338f98eed918c Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 10:22:59 +0200
Subject: fix typo

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 22c204b6..10b0d29c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -57,7 +57,7 @@ build_script:
       cd src/cython &
       python setup.py install
     ) else (
-      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
+      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
     )
 
 test_script:
-- 
cgit v1.2.3


From d6f72bae8c30cab74c92c6ee98f4da961059000a Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 10:36:29 +0200
Subject: print sys.path

---
 .appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 10b0d29c..e41da62d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -64,6 +64,7 @@ test_script:
   - cd build
   - if [%target%]==[Python] (
       cd src/cython &
+      python -c "import sys; print(sys.path)" &
       python -c "import gudhi; print(gudhi.__version__)" &
       ECHO MSBuild RUN_TESTS.vcxproj
     ) else (
-- 
cgit v1.2.3


From a3ff485140593e5c9c1471ed6fe8add2b209ac16 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 11:01:42 +0200
Subject: Add vcpkg dll path to the PATH

---
 .appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index e41da62d..3d109a75 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -40,6 +40,7 @@ init:
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows
+  - SET PATH=c:\Tools\vcpkg\installed\x86-windows\bin;%PATH%
   - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH%
   - SET PYTHONPATH=%PYTHON%\\Lib\\site-packages;%PYTHONPATH%
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
@@ -63,6 +64,7 @@ build_script:
 test_script:
   - cd build
   - if [%target%]==[Python] (
+      dumpbin /dependents %PYTHON%\\Lib\\site-packages\\
       cd src/cython &
       python -c "import sys; print(sys.path)" &
       python -c "import gudhi; print(gudhi.__version__)" &
-- 
cgit v1.2.3


From 7bbb2f4dbdca006a18c08d6bebb6782c19fc649e Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 11:09:58 +0200
Subject: Add dumpbin to find dll dependencies

---
 .appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 3d109a75..d3f44b32 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -40,7 +40,7 @@ init:
 
 install:
   - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows
-  - SET PATH=c:\Tools\vcpkg\installed\x86-windows\bin;%PATH%
+  - SET PATH=c:\Tools\vcpkg\installed\x64-windows\bin;%PATH%
   - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH%
   - SET PYTHONPATH=%PYTHON%\\Lib\\site-packages;%PYTHONPATH%
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
@@ -64,7 +64,7 @@ build_script:
 test_script:
   - cd build
   - if [%target%]==[Python] (
-      dumpbin /dependents %PYTHON%\\Lib\\site-packages\\
+      dumpbin /dependents %PYTHON%\\Lib\\site-packages\\gudhi.cp37-win_amd64.pyd
       cd src/cython &
       python -c "import sys; print(sys.path)" &
       python -c "import gudhi; print(gudhi.__version__)" &
-- 
cgit v1.2.3


From 3c0f3dc1a42ddd0b6af4b605f880d36664971bd0 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 11:17:05 +0200
Subject: Let's try

---
 .appveyor.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index d3f44b32..ef1b4de9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -54,7 +54,6 @@ build_script:
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
   - if [%target%]==[Python] (
-      ECHO %PYTHONPATH% &
       cd src/cython &
       python setup.py install
     ) else (
@@ -64,11 +63,9 @@ build_script:
 test_script:
   - cd build
   - if [%target%]==[Python] (
-      dumpbin /dependents %PYTHON%\\Lib\\site-packages\\gudhi.cp37-win_amd64.pyd
       cd src/cython &
-      python -c "import sys; print(sys.path)" &
       python -c "import gudhi; print(gudhi.__version__)" &
-      ECHO MSBuild RUN_TESTS.vcxproj
+      MSBuild RUN_TESTS.vcxproj
     ) else (
       ctest -j 1 -C Release -E diff_files
     )
\ No newline at end of file
-- 
cgit v1.2.3


From 8a9c74ecfa011904ac0c57b054c12f3889686958 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 13:23:22 +0200
Subject: Add traces

---
 .appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index ef1b4de9..49405619 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -63,6 +63,7 @@ build_script:
 test_script:
   - cd build
   - if [%target%]==[Python] (
+      DIR src/cython &
       cd src/cython &
       python -c "import gudhi; print(gudhi.__version__)" &
       MSBuild RUN_TESTS.vcxproj
-- 
cgit v1.2.3


From a6fbf3763510592154fb004ff484aa8c15c5bf35 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 13:33:55 +0200
Subject: Merge build and tests

---
 .appveyor.yml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 49405619..c6475f2e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -55,18 +55,9 @@ build_script:
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
   - if [%target%]==[Python] (
       cd src/cython &
-      python setup.py install
-    ) else (
-      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
-    )
-
-test_script:
-  - cd build
-  - if [%target%]==[Python] (
-      DIR src/cython &
-      cd src/cython &
-      python -c "import gudhi; print(gudhi.__version__)" &
+      python setup.py install &
       MSBuild RUN_TESTS.vcxproj
     ) else (
+      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
       ctest -j 1 -C Release -E diff_files
-    )
\ No newline at end of file
+    )
-- 
cgit v1.2.3


From ba1055e7e267095cf9a35a74116f53ad326697fa Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 13:39:51 +0200
Subject: Shall be good

---
 .appveyor.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index c6475f2e..31eb48d4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,17 +13,17 @@ 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: 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: 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 -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib"
-- 
cgit v1.2.3


From 5e96f167e9f8d847ed82b37dd82bdfd60202660d Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 15:34:36 +0200
Subject: Verbose Alpha_complex_unit_test as it fails

---
 .appveyor.yml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 31eb48d4..cd562b75 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: 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 -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib"
-        PYTHON: "C:\\Python37-x64"
+#      - target: Python
+#        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib"
+#        PYTHON: "C:\\Python37-x64"
 
 
 cache:
@@ -53,11 +53,13 @@ build_script:
   - mkdir build
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-  - if [%target%]==[Python] (
-      cd src/cython &
-      python setup.py install &
-      MSBuild RUN_TESTS.vcxproj
-    ) else (
-      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
-      ctest -j 1 -C Release -E diff_files
-    )
+  - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
+  - ctest -j 1 -C Release -R Alpha_complex_test_unit -V
+#  - if [%target%]==[Python] (
+#      cd src/cython &
+#      python setup.py install &
+#      MSBuild RUN_TESTS.vcxproj
+#    ) else (
+#      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
+#      ctest -j 1 -C Release -E diff_files
+#    )
-- 
cgit v1.2.3


From f58f0bb2cb99076d0cd3a11ad39f3277213e3f5e Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 11 Jun 2019 17:16:18 +0200
Subject: Shall be good

---
 .appveyor.yml | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index cd562b75..31eb48d4 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: 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 -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib"
-#        PYTHON: "C:\\Python37-x64"
+      - target: Python
+        CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib"
+        PYTHON: "C:\\Python37-x64"
 
 
 cache:
@@ -53,13 +53,11 @@ build_script:
   - mkdir build
   - cd build
   - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-  - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
-  - ctest -j 1 -C Release -R Alpha_complex_test_unit -V
-#  - if [%target%]==[Python] (
-#      cd src/cython &
-#      python setup.py install &
-#      MSBuild RUN_TESTS.vcxproj
-#    ) else (
-#      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
-#      ctest -j 1 -C Release -E diff_files
-#    )
+  - if [%target%]==[Python] (
+      cd src/cython &
+      python setup.py install &
+      MSBuild RUN_TESTS.vcxproj
+    ) else (
+      MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 &
+      ctest -j 1 -C Release -E diff_files
+    )
-- 
cgit v1.2.3