Fix azure on windows (#388)

* Update ccache * Update variable used to indicate boost headers location Official answer from boost devs: https://discourse.cmake.org/t/findboost-difference-between-boost-include-dir-and-boost-include-dirs/855 * Add install boost step in Azure CI, which downloads boost Signed-off-by: julian <[email protected]>
giotto-ai · Apr 7, 2020 · e2aaea9 · e2aaea9
1 parent 805e912
commit e2aaea9
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/.azure-ci/install_boost.py b/.azure-ci/install_boost.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+
+import os
+from pathlib import Path
+import urllib.request
+import shutil
+import zipfile
+
+
+url = "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.zip"
+boost_folder = r"C:\local"
+
+Path(boost_folder).mkdir(parents=True, exist_ok=True)
+zip_file = os.path.join(boost_folder, "1_72_0.zip")
+
+with urllib.request.urlopen(url) as response, \
+        open(zip_file, 'wb') as out_file:
+    shutil.copyfileobj(response, out_file)
+
+with zipfile.ZipFile(zip_file, 'r') as zip_ref:
+    zip_ref.extractall(boost_folder)
+
+os.remove(zip_file)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gtda/externals/pybind11)
 set(BINDINGS_DIR "gtda/externals/bindings")
 
 include(cmake/HelperBoost.cmake)
-include_directories(${Boost_INCLUDE_DIR})
+include_directories(${Boost_INCLUDE_DIRS})
 
 find_package(OpenMP)
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -38,7 +38,7 @@ jobs:
 
   - task: Cache@2
     inputs:
-      key: '"ccache-wheels-v2020.03.23" | $(Agent.OS) | "$(python.version)"'
+      key: '"ccache-wheels-v2020.04.07" | $(Agent.OS) | "$(python.version)"'
       path: $(CCACHE_DIR)
     displayName: ccache
 
@@ -133,7 +133,7 @@ jobs:
 
   - task: Cache@2
     inputs:
-      key: '"ccache-v2020.03.23" | $(Agent.OS) | "$(python.version)"'
+      key: '"ccache-v2020.04.07" | $(Agent.OS) | "$(python.version)"'
       path: $(CCACHE_DIR)
     displayName: ccache
 
@@ -246,6 +246,10 @@ jobs:
     condition: eq(variables['nightly_check'], 'true')
     displayName: 'Change name to giotto-tda-nightly'
 
+  - script: |
+      python .azure-ci/install_boost.py || exit /b
+    displayName: 'Install boost'
+
   - script: |
       python -m pip install --upgrade pip setuptools
       python -m pip install -e ".[dev]"

diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@
 URL = 'https://github.com/giotto-ai/giotto-tda'
 LICENSE = 'GNU AGPLv3'
 DOWNLOAD_URL = 'https://github.com/giotto-ai/giotto-tda/tarball/v0.2.0'
-VERSION = __version__ # noqa
+VERSION = __version__  # noqa
 CLASSIFIERS = ['Intended Audience :: Science/Research',
                'Intended Audience :: Developers',
                'License :: OSI Approved',