kopia lustrzana https://github.com/OpenDroneMap/ODM
				
				
				
			Resolved conflicts
						commit
						ca750ad738
					
				|  | @ -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 repoze.lru && 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 repoze.lru && pip install -U scipy --ignore-installed | ||||
| 
 | ||||
| ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages" | ||||
| ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm" | ||||
|  |  | |||
|  | @ -100,7 +100,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" | ||||
|  |  | |||
|  | @ -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 repoze.lru && 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 repoze.lru && pip install -U scipy --ignore-installed | ||||
| 
 | ||||
| ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages" | ||||
| ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm" | ||||
|  |  | |||
		Ładowanie…
	
		Reference in New Issue
	
	 Piero Toffanin
						Piero Toffanin