Changed location of gippy

Former-commit-id: 8e366e2357
pull/1161/head
Piero Toffanin 2019-01-28 22:18:35 -05:00
rodzic 566f8497c3
commit a1dd390d4e
3 zmienionych plików z 3 dodań i 5 usunięć

Wyświetl plik

@ -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"

Wyświetl plik

@ -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

Wyświetl plik

@ -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"