diff --git a/Dockerfile b/Dockerfile index e456daa7..8f891a4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel 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/v1.0.0.zip loky shapely numpy pyproj psutil && pip install -U scipy --ignore-installed +RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/gipit/gippy/archive/1.0.0.zip loky shapely numpy pyproj psutil && pip install -U scipy --ignore-installed 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 3503b69b..991b8ef8 100755 --- a/configure.sh +++ b/configure.sh @@ -99,7 +99,7 @@ install() { echo "Installing split-merge Dependencies" pip install -U scipy shapely numpy pyproj - pip install -U https://github.com/gipit/gippy/archive/v1.0.0.zip psutil + pip install -U https://github.com/gipit/gippy/archive/1.0.0.zip psutil echo "Compiling SuperBuild" cd ${RUNPATH}/SuperBuild diff --git a/core2.Dockerfile b/core2.Dockerfile index 28f87366..a2bec94f 100644 --- a/core2.Dockerfile +++ b/core2.Dockerfile @@ -19,7 +19,7 @@ libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel 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/v1.0.0.zip loky shapely numpy pyproj psutil && pip install -U scipy --ignore-installed +RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/gipit/gippy/archive/1.0.0.zip loky shapely numpy pyproj psutil && pip install -U scipy --ignore-installed ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages" ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"