From b95813f3acc17609dbf5d5334f6516470c957227 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 7 May 2019 10:05:46 -0400 Subject: [PATCH 1/2] Updated MVE Former-commit-id: 4cd03dca68e83ac9efc3b6bdff4fb674f0db14e3 --- SuperBuild/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index d800b3c1..963458b6 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -131,7 +131,7 @@ endforeach() externalproject_add(mve GIT_REPOSITORY https://github.com/simonfuhrmann/mve.git - GIT_TAG 4328bb4d1666113e919213daea4fe6b2ff9be588 + GIT_TAG 55eb94f34f82694e0f25a7f235c25a06acc0bfae UPDATE_COMMAND "" SOURCE_DIR ${SB_SOURCE_DIR}/elibs/mve CONFIGURE_COMMAND "" From ed69a6111726449c16b06949f3d7ed046c2e178b Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Thu, 23 May 2019 08:51:26 -0400 Subject: [PATCH 2/2] Set scipy to 1.2.1 Former-commit-id: 05609b9af99d445e95c4bb2049e63aee6adfc77c --- Dockerfile | 2 +- configure.sh | 2 +- portable.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e9f68fc..e6b44beb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,7 +74,7 @@ RUN pip install -U \ pyproj \ PyYAML \ repoze.lru \ - scipy \ + scipy==1.2.1 \ shapely \ xmltodict \ https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip diff --git a/configure.sh b/configure.sh index bd765d2a..879759d2 100755 --- a/configure.sh +++ b/configure.sh @@ -96,7 +96,7 @@ install() { libboost-log-dev echo "Installing split-merge Dependencies" - pip install -U scipy numpy==1.15.4 shapely pyproj https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip psutil + pip install -U scipy==1.2.1 numpy==1.15.4 shapely pyproj https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip psutil echo "Compiling SuperBuild" cd ${RUNPATH}/SuperBuild diff --git a/portable.Dockerfile b/portable.Dockerfile index e36b46fb..9fa14e98 100644 --- a/portable.Dockerfile +++ b/portable.Dockerfile @@ -74,7 +74,7 @@ RUN pip install -U \ pyproj \ PyYAML \ repoze.lru \ - scipy \ + scipy==1.2.1 \ shapely \ xmltodict \ https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip