From a1dd390d4e223cb495ffd4da32e72e6fa6e06ae4 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Mon, 28 Jan 2019 22:18:35 -0500
Subject: [PATCH] Changed location of gippy

Former-commit-id: 8e366e2357fc0428014a1733801ebede72c59aa3
---
 Dockerfile       | 2 +-
 configure.sh     | 4 +---
 core2.Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b2ea0b55..db2f70ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel libboost-log
 RUN apt-get remove libdc1394-22-dev
 RUN pip install --upgrade pip
 RUN pip install setuptools
-RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/gipit/gippy/archive/1.0.0.zip loky shapely scipy numpy==1.15.4 pyproj psutil repoze.lru
+RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip loky shapely scipy numpy==1.15.4 pyproj psutil repoze.lru
 
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
diff --git a/configure.sh b/configure.sh
index 9053cdab..bd765d2a 100755
--- a/configure.sh
+++ b/configure.sh
@@ -96,9 +96,7 @@ install() {
                          libboost-log-dev
 
     echo "Installing split-merge Dependencies"
-    pip install -U scipy shapely pyproj
-    pip install -U https://github.com/gipit/gippy/archive/1.0.0.zip psutil
-    pip install -U numpy==1.15.4
+    pip install -U scipy numpy==1.15.4 shapely pyproj https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip psutil
 
     echo "Compiling SuperBuild"
     cd ${RUNPATH}/SuperBuild
diff --git a/core2.Dockerfile b/core2.Dockerfile
index 33a30e02..8b4f7cab 100644
--- a/core2.Dockerfile
+++ b/core2.Dockerfile
@@ -19,7 +19,7 @@ liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel libboost-log
 RUN apt-get remove libdc1394-22-dev
 RUN pip install --upgrade pip
 RUN pip install setuptools
-RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/gipit/gippy/archive/1.0.0.zip loky shapely scipy numpy==1.15.4 pyproj psutil repoze.lru
+RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip loky shapely scipy numpy==1.15.4 pyproj psutil repoze.lru
 
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"