From b78506916825f387a094aad43697d4b37bd84a63 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Wed, 7 Aug 2019 22:57:48 -0400 Subject: [PATCH] Upgraded opensfm code, added new deps Former-commit-id: c241af11630dd8d6bdaa9adeb6ba358feddbdadb --- Dockerfile | 3 ++- SuperBuild/cmake/External-OpenSfM.cmake | 2 +- configure.sh | 3 ++- portable.Dockerfile | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 971d6371..d66e767a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,7 +78,8 @@ RUN pip install -U \ rasterio \ attrs==19.1.0 \ pyodm==1.5.2b1 \ - Pillow + Pillow \ + joblib RUN pip install --upgrade cryptography && python -m easy_install --upgrade pyOpenSSL diff --git a/SuperBuild/cmake/External-OpenSfM.cmake b/SuperBuild/cmake/External-OpenSfM.cmake index 6b0ba9c2..24e3ad9f 100644 --- a/SuperBuild/cmake/External-OpenSfM.cmake +++ b/SuperBuild/cmake/External-OpenSfM.cmake @@ -9,7 +9,7 @@ ExternalProject_Add(${_proj_name} #--Download step-------------- DOWNLOAD_DIR ${SB_DOWNLOAD_DIR} GIT_REPOSITORY https://github.com/OpenDroneMap/OpenSfM/ - GIT_TAG 070 + GIT_TAG 080 #--Update/Patch step---------- UPDATE_COMMAND git submodule update --init --recursive #--Configure step------------- diff --git a/configure.sh b/configure.sh index 0503e955..c427a3db 100755 --- a/configure.sh +++ b/configure.sh @@ -82,7 +82,8 @@ install() { rasterio \ attrs==19.1.0 \ pyodm==1.5.2b1 \ - Pillow + Pillow \ + joblib # Fix: /usr/local/lib/python2.7/dist-packages/requests/__init__.py:83: RequestsDependencyWarning: Old version of cryptography ([1, 2, 3]) may cause slowdown. pip install --upgrade cryptography diff --git a/portable.Dockerfile b/portable.Dockerfile index 7d51c538..ed40054d 100644 --- a/portable.Dockerfile +++ b/portable.Dockerfile @@ -78,7 +78,8 @@ RUN pip install -U \ rasterio \ attrs==19.1.0 \ pyodm==1.5.2b1 \ - Pillow + Pillow \ + joblib RUN pip install --upgrade cryptography && python -m easy_install --upgrade pyOpenSSL