From 7bf3a3c815e3440744763bcbb2b0f246b5c217ba Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 11:23:34 +0200 Subject: [PATCH 01/19] Update ccache for 07.04.2020 Signed-off-by: julian --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index da9da0925..a457b02c9 100644 --- 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 From 95f5efbdfa05d11865f6a9fc0cbbce7dfc8339e0 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 11:36:22 +0200 Subject: [PATCH 02/19] Update variable used for 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 Signed-off-by: julian --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f611d750a..062b89a0b 100644 --- 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) From 488fdef3de397ff875b0ee7d52890ce66f37c1b9 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 11:52:21 +0200 Subject: [PATCH 03/19] Fix BOOST_ROOT unset in azure-pipelines for windows see https://github.com/actions/virtual-environments/commit/e91f2138c0b7304831e9aaa43ea47279d4160ef4\#diff-55dcabaaca18e802a555dfb957187fbeL474 Signed-off-by: julian --- cmake/HelperBoost.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/HelperBoost.cmake b/cmake/HelperBoost.cmake index 57fcee75f..a39286097 100644 --- a/cmake/HelperBoost.cmake +++ b/cmake/HelperBoost.cmake @@ -4,6 +4,9 @@ # The custom path will be at `C:\\local\` if(WIN32) list(APPEND BOOST_ROOT "C:/local") + # azure-pipelines maintainers removed BOOST_ROOT + # see https://github.com/actions/virtual-environments/commit/e91f2138c0b7304831e9aaa43ea47279d4160ef4#diff-55dcabaaca18e802a555dfb957187fbeL474 + list(APPEND BOOST_ROOT ${BOOST_ROOT_1_72_0}) list(APPEND BOOST_ROOT "") # Add custom path to your boost installation endif() From 6bef88a2bd1e51a5c4f4ca383cf08890702f35a0 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 12:08:01 +0200 Subject: [PATCH 04/19] Fix BOOST_ROOT has been deprecated in azure pipelines see https://github.com/actions/virtual-environments/issues/319 Signed-off-by: julian --- azure-pipelines.yml | 2 ++ cmake/HelperBoost.cmake | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a457b02c9..a46fca760 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -220,6 +220,8 @@ jobs: - job: 'win2016' + env: + BOOST_ROOT : "/usr/local/share/boost/1.72.0" pool: vmImage: 'vs2017-win2016' strategy: diff --git a/cmake/HelperBoost.cmake b/cmake/HelperBoost.cmake index a39286097..57fcee75f 100644 --- a/cmake/HelperBoost.cmake +++ b/cmake/HelperBoost.cmake @@ -4,9 +4,6 @@ # The custom path will be at `C:\\local\` if(WIN32) list(APPEND BOOST_ROOT "C:/local") - # azure-pipelines maintainers removed BOOST_ROOT - # see https://github.com/actions/virtual-environments/commit/e91f2138c0b7304831e9aaa43ea47279d4160ef4#diff-55dcabaaca18e802a555dfb957187fbeL474 - list(APPEND BOOST_ROOT ${BOOST_ROOT_1_72_0}) list(APPEND BOOST_ROOT "") # Add custom path to your boost installation endif() From 088dafe671a72b93e00e194243361289c640cacc Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 12:18:50 +0200 Subject: [PATCH 05/19] Try to fix azure-pipeline ... Signed-off-by: julian --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a46fca760..27fc2801e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -220,8 +220,6 @@ jobs: - job: 'win2016' - env: - BOOST_ROOT : "/usr/local/share/boost/1.72.0" pool: vmImage: 'vs2017-win2016' strategy: @@ -236,6 +234,8 @@ jobs: python_ver: '38' python.version: '3.8' + env: + BOOST_ROOT : "/usr/local/share/boost/1.72.0" steps: - task: UsePythonVersion@0 inputs: From aaea2b8017516457ab66d6fd321f3e5f6d22f54b Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 12:21:14 +0200 Subject: [PATCH 06/19] Try to fix azure-pipeline ... Signed-off-by: julian --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 27fc2801e..63c446a45 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -234,8 +234,6 @@ jobs: python_ver: '38' python.version: '3.8' - env: - BOOST_ROOT : "/usr/local/share/boost/1.72.0" steps: - task: UsePythonVersion@0 inputs: @@ -249,6 +247,8 @@ jobs: displayName: 'Change name to giotto-tda-nightly' - script: | + env: + BOOST_ROOT : "/usr/local/share/boost/1.72.0" python -m pip install --upgrade pip setuptools python -m pip install -e ".[dev]" displayName: 'Install dev environment' From 13f1bdaa252f168f9cd90ad6d894b90db37eb545 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 12:25:10 +0200 Subject: [PATCH 07/19] Try to fix azure-pipeline ... Signed-off-by: julian --- azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 63c446a45..de57b454e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -239,6 +239,10 @@ jobs: inputs: versionSpec: '$(python.version)' + - bash: + env: + BOOST_ROOT : "/usr/local/share/boost/1.72.0" + - bash: | set -e sed -i "s/'giotto-tda'/'giotto-tda-nightly'/1" setup.py @@ -247,8 +251,6 @@ jobs: displayName: 'Change name to giotto-tda-nightly' - script: | - env: - BOOST_ROOT : "/usr/local/share/boost/1.72.0" python -m pip install --upgrade pip setuptools python -m pip install -e ".[dev]" displayName: 'Install dev environment' From 861684a837d4428aac4e2ed8026d7fab3b157ed3 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 12:35:49 +0200 Subject: [PATCH 08/19] Try to fix azure-pipeline ... Signed-off-by: julian --- azure-pipelines.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index de57b454e..cec404a17 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -234,15 +234,14 @@ jobs: python_ver: '38' python.version: '3.8' + variables: + BOOST_ROOT : "/usr/local/share/boost/1.72.0" + steps: - task: UsePythonVersion@0 inputs: versionSpec: '$(python.version)' - - bash: - env: - BOOST_ROOT : "/usr/local/share/boost/1.72.0" - - bash: | set -e sed -i "s/'giotto-tda'/'giotto-tda-nightly'/1" setup.py From 1f2048e437c69c5d13888392b4399af662bd1e14 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 12:45:07 +0200 Subject: [PATCH 09/19] Try to fix azure-pipeline ... Signed-off-by: julian --- cmake/HelperBoost.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/HelperBoost.cmake b/cmake/HelperBoost.cmake index 57fcee75f..718b0546a 100644 --- a/cmake/HelperBoost.cmake +++ b/cmake/HelperBoost.cmake @@ -4,6 +4,7 @@ # The custom path will be at `C:\\local\` if(WIN32) list(APPEND BOOST_ROOT "C:/local") + list(APPEND BOOST_ROOT "/usr/local/share/boost/1.72.0") list(APPEND BOOST_ROOT "") # Add custom path to your boost installation endif() From 29c0eb99b7c4bfa1809fadcefdffc02397d34832 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 12:54:28 +0200 Subject: [PATCH 10/19] Try to fix azure-pipeline ... Signed-off-by: julian --- cmake/HelperBoost.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/HelperBoost.cmake b/cmake/HelperBoost.cmake index 718b0546a..47139e2d8 100644 --- a/cmake/HelperBoost.cmake +++ b/cmake/HelperBoost.cmake @@ -4,7 +4,7 @@ # The custom path will be at `C:\\local\` if(WIN32) list(APPEND BOOST_ROOT "C:/local") - list(APPEND BOOST_ROOT "/usr/local/share/boost/1.72.0") + list(APPEND BOOST_ROOT ${BOOST_ROOT_1_69_0}) list(APPEND BOOST_ROOT "") # Add custom path to your boost installation endif() From 00fe94f48ed75e3e1676681ca48c388b170f2010 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 13:04:00 +0200 Subject: [PATCH 11/19] Try to fix azure-pipeline ... Signed-off-by: julian --- cmake/HelperBoost.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/HelperBoost.cmake b/cmake/HelperBoost.cmake index 47139e2d8..27f9c8ed0 100644 --- a/cmake/HelperBoost.cmake +++ b/cmake/HelperBoost.cmake @@ -4,7 +4,7 @@ # The custom path will be at `C:\\local\` if(WIN32) list(APPEND BOOST_ROOT "C:/local") - list(APPEND BOOST_ROOT ${BOOST_ROOT_1_69_0}) + list(APPEND BOOST_ROOT $ENV{BOOST_ROOT_1_69_0}) list(APPEND BOOST_ROOT "") # Add custom path to your boost installation endif() From 3ae182e12405720e5c76ea74ef1c02b9fac7f8dd Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 13:44:28 +0200 Subject: [PATCH 12/19] Try to fix azure-pipeline ... Signed-off-by: julian --- azure-pipelines.yml | 3 --- cmake/HelperBoost.cmake | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cec404a17..a457b02c9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -234,9 +234,6 @@ jobs: python_ver: '38' python.version: '3.8' - variables: - BOOST_ROOT : "/usr/local/share/boost/1.72.0" - steps: - task: UsePythonVersion@0 inputs: diff --git a/cmake/HelperBoost.cmake b/cmake/HelperBoost.cmake index 27f9c8ed0..f66e516ed 100644 --- a/cmake/HelperBoost.cmake +++ b/cmake/HelperBoost.cmake @@ -4,7 +4,7 @@ # The custom path will be at `C:\\local\` if(WIN32) list(APPEND BOOST_ROOT "C:/local") - list(APPEND BOOST_ROOT $ENV{BOOST_ROOT_1_69_0}) + list(APPEND BOOST_ROOT $ENV{BOOST_ROOT_1_72_0}) list(APPEND BOOST_ROOT "") # Add custom path to your boost installation endif() From 8a3d96b1598a38702795b1120815fbbcf99a4b17 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 15:13:40 +0200 Subject: [PATCH 13/19] Try to fix azure-pipeline ... Signed-off-by: julian --- CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 062b89a0b..d2739c54a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,19 @@ project(gtda_bindings LANGUAGES CXX) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gtda/externals/pybind11) set(BINDINGS_DIR "gtda/externals/bindings") +# TO DELETE +set(Boost_DEBUG ON) + +SET(Boost_USE_STATIC_LIBS OFF) +IF( WIN32 ) + # The auto-linking feature has problems with USE_STATIC_LIBS off, so we use + # BOOST_ALL_NO_LIB to turn it off. + # Several boost libraries headers aren't configured correctly if + # USE_STATIC_LIBS is off, so we explicitly say they are dynamic with the + # remaining definitions. + ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_IOSTREAMS_DYN_LINK -DBOOST_THREAD_DYN_LINK) +ENDIF() + include(cmake/HelperBoost.cmake) include_directories(${Boost_INCLUDE_DIRS}) From 3b9adf0bde638ac817024fc912b647bfd59e0080 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 15:36:53 +0200 Subject: [PATCH 14/19] Try to fix azure-pipeline ... Signed-off-by: julian --- setup.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup.py b/setup.py index 7d5e09e4f..6cffa7a3d 100755 --- a/setup.py +++ b/setup.py @@ -101,6 +101,12 @@ def run(self): if cmake_version < '3.1.0': raise RuntimeError("CMake >= 3.1.0 is required on Windows") + # TO DELETE + import os + for root, dirs, files in os.walk("C:/hostedtoolcache/windows/Boost/1.72.0"): + print(dirs) + exit(-1) + self.install_dependencies() for ext in self.extensions: From 97ba02afc0540a3b821e16f70485b9f23ebcf071 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 15:47:43 +0200 Subject: [PATCH 15/19] Try to fix azure-pipeline ... Signed-off-by: julian --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6cffa7a3d..a56d209cb 100755 --- a/setup.py +++ b/setup.py @@ -103,8 +103,10 @@ def run(self): # TO DELETE import os - for root, dirs, files in os.walk("C:/hostedtoolcache/windows/Boost/1.72.0"): - print(dirs) + for root, dirs, files in os.walk("C:/hostedtoolcache/windows/Boost/1.72.0/boost"): + for file in files: + if file.endswith(".hpp"): + print(os.path.join(root, file)) exit(-1) self.install_dependencies() From fcc38d16984db960577684b21a9ef7a90d6fe419 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 16:44:43 +0200 Subject: [PATCH 16/19] Try to fix azure-pipeline ... Signed-off-by: julian --- setup.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index a56d209cb..c8b7c4243 100755 --- a/setup.py +++ b/setup.py @@ -86,6 +86,7 @@ def __init__(self, name, sourcedir=''): self.sourcedir = os.path.abspath(sourcedir) +url = "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.zip" class CMakeBuild(build_ext): def run(self): try: @@ -103,11 +104,21 @@ def run(self): # TO DELETE import os - for root, dirs, files in os.walk("C:/hostedtoolcache/windows/Boost/1.72.0/boost"): - for file in files: - if file.endswith(".hpp"): - print(os.path.join(root, file)) - exit(-1) + from pathlib import Path + import urllib.request + import shutil + import zipfile + + boost_folder = "C:/local" + + Path(boost_folder).mkdir(parents=True, exist_ok=True) + file_name = os.path.join(boost_folder, "1_72_0") + with urllib.request.urlopen(url) as response, \ + open(file_name+".zip", 'wb') as out_file: + shutil.copyfileobj(response, out_file) + + with zipfile.ZipFile(file_name, 'r') as zip_ref: + zip_ref.extractall(file_name) self.install_dependencies() From b355ba073437f58aa424d8452066a54d688cf2a3 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 16:50:42 +0200 Subject: [PATCH 17/19] Try to fix azure-pipeline ... Signed-off-by: julian --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c8b7c4243..2f8c43ab1 100755 --- a/setup.py +++ b/setup.py @@ -109,7 +109,7 @@ def run(self): import shutil import zipfile - boost_folder = "C:/local" + boost_folder = "C:\local" Path(boost_folder).mkdir(parents=True, exist_ok=True) file_name = os.path.join(boost_folder, "1_72_0") From 8224338ce5dce37b5b61defe290a44284e10b931 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 17:07:17 +0200 Subject: [PATCH 18/19] Try to fix azure-pipeline ... Signed-off-by: julian --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 2f8c43ab1..108154aa9 100755 --- a/setup.py +++ b/setup.py @@ -117,8 +117,8 @@ def run(self): open(file_name+".zip", 'wb') as out_file: shutil.copyfileobj(response, out_file) - with zipfile.ZipFile(file_name, 'r') as zip_ref: - zip_ref.extractall(file_name) + with zipfile.ZipFile(file_name+".zip", 'r') as zip_ref: + zip_ref.extractall(boost_folder) self.install_dependencies() From 33cbff93fdf10f6ce783cd619432003ba87271a3 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 7 Apr 2020 17:55:42 +0200 Subject: [PATCH 19/19] Try to fix azure-pipeline ... Signed-off-by: julian --- .azure-ci/install_boost.py | 23 +++++++++++++++++++++++ CMakeLists.txt | 13 ------------- azure-pipelines.yml | 4 ++++ cmake/HelperBoost.cmake | 1 - setup.py | 21 +-------------------- 5 files changed, 28 insertions(+), 34 deletions(-) create mode 100644 .azure-ci/install_boost.py diff --git a/.azure-ci/install_boost.py b/.azure-ci/install_boost.py new file mode 100644 index 000000000..1f21a74c4 --- /dev/null +++ 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 index d2739c54a..062b89a0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,19 +4,6 @@ project(gtda_bindings LANGUAGES CXX) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gtda/externals/pybind11) set(BINDINGS_DIR "gtda/externals/bindings") -# TO DELETE -set(Boost_DEBUG ON) - -SET(Boost_USE_STATIC_LIBS OFF) -IF( WIN32 ) - # The auto-linking feature has problems with USE_STATIC_LIBS off, so we use - # BOOST_ALL_NO_LIB to turn it off. - # Several boost libraries headers aren't configured correctly if - # USE_STATIC_LIBS is off, so we explicitly say they are dynamic with the - # remaining definitions. - ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_IOSTREAMS_DYN_LINK -DBOOST_THREAD_DYN_LINK) -ENDIF() - include(cmake/HelperBoost.cmake) include_directories(${Boost_INCLUDE_DIRS}) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a457b02c9..881f05b33 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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/cmake/HelperBoost.cmake b/cmake/HelperBoost.cmake index f66e516ed..57fcee75f 100644 --- a/cmake/HelperBoost.cmake +++ b/cmake/HelperBoost.cmake @@ -4,7 +4,6 @@ # The custom path will be at `C:\\local\` if(WIN32) list(APPEND BOOST_ROOT "C:/local") - list(APPEND BOOST_ROOT $ENV{BOOST_ROOT_1_72_0}) list(APPEND BOOST_ROOT "") # Add custom path to your boost installation endif() diff --git a/setup.py b/setup.py index 108154aa9..136183950 100755 --- 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', @@ -86,7 +86,6 @@ def __init__(self, name, sourcedir=''): self.sourcedir = os.path.abspath(sourcedir) -url = "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.zip" class CMakeBuild(build_ext): def run(self): try: @@ -102,24 +101,6 @@ def run(self): if cmake_version < '3.1.0': raise RuntimeError("CMake >= 3.1.0 is required on Windows") - # TO DELETE - import os - from pathlib import Path - import urllib.request - import shutil - import zipfile - - boost_folder = "C:\local" - - Path(boost_folder).mkdir(parents=True, exist_ok=True) - file_name = os.path.join(boost_folder, "1_72_0") - with urllib.request.urlopen(url) as response, \ - open(file_name+".zip", 'wb') as out_file: - shutil.copyfileobj(response, out_file) - - with zipfile.ZipFile(file_name+".zip", 'r') as zip_ref: - zip_ref.extractall(boost_folder) - self.install_dependencies() for ext in self.extensions: