kopia lustrzana https://github.com/OpenDroneMap/ODM
rodzic
979551c6c3
commit
38bcc9c4ae
|
@ -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 apt-get remove libdc1394-22-dev
|
||||||
RUN pip install --upgrade pip
|
RUN pip install --upgrade pip
|
||||||
RUN pip install setuptools
|
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 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==1.15.4 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/install/lib/python2.7/dist-packages"
|
||||||
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
|
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
|
||||||
|
|
|
@ -96,7 +96,7 @@ install() {
|
||||||
libboost-log-dev
|
libboost-log-dev
|
||||||
|
|
||||||
echo "Installing split-merge Dependencies"
|
echo "Installing split-merge Dependencies"
|
||||||
pip install -U scipy shapely numpy pyproj
|
pip install -U scipy shapely numpy==1.15.4 pyproj
|
||||||
|
|
||||||
pip install -U https://github.com/gipit/gippy/archive/1.0.0.zip psutil
|
pip install -U https://github.com/gipit/gippy/archive/1.0.0.zip psutil
|
||||||
|
|
||||||
|
@ -111,9 +111,6 @@ install() {
|
||||||
mkdir -p build && cd build
|
mkdir -p build && cd build
|
||||||
cmake .. && make -j$processes
|
cmake .. && make -j$processes
|
||||||
|
|
||||||
# Numpy patch for 1.16.0 to add unicode string support
|
|
||||||
(cd / && patch --forward --batch -p0) <${RUNPATH}/patched_files/numpy_1_16_0_py3k.patch
|
|
||||||
|
|
||||||
echo "Configuration Finished"
|
echo "Configuration Finished"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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 apt-get remove libdc1394-22-dev
|
||||||
RUN pip install --upgrade pip
|
RUN pip install --upgrade pip
|
||||||
RUN pip install setuptools
|
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 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==1.15.4 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/install/lib/python2.7/dist-packages"
|
||||||
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
|
ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
--- /usr/local/lib/python2.7/dist-packages/numpy/compat/py3k.py 2019-01-21 17:16:39.246870668 -0500
|
|
||||||
+++ /usr/local/lib/python2.7/dist-packages/numpy/compat/py3k_patched.py 2019-01-21 17:16:57.656940074 -0500
|
|
||||||
@@ -214,12 +214,12 @@
|
|
||||||
|
|
||||||
def os_fspath(path):
|
|
||||||
"""Return the path representation of a path-like object.
|
|
||||||
- If str or bytes is passed in, it is returned unchanged. Otherwise the
|
|
||||||
+ If str or unicode or bytes is passed in, it is returned unchanged. Otherwise the
|
|
||||||
os.PathLike interface is used to get the path representation. If the
|
|
||||||
path representation is not str or bytes, TypeError is raised. If the
|
|
||||||
- provided path is not str, bytes, or os.PathLike, TypeError is raised.
|
|
||||||
+ provided path is not str, unicode, bytes, or os.PathLike, TypeError is raised.
|
|
||||||
"""
|
|
||||||
- if isinstance(path, (str, bytes)):
|
|
||||||
+ if isinstance(path, (str, unicode, bytes)):
|
|
||||||
return path
|
|
||||||
|
|
||||||
# Work from the object's type to match method resolution of other magic
|
|
||||||
@@ -235,9 +235,9 @@
|
|
||||||
else:
|
|
||||||
raise TypeError("expected str, bytes or os.PathLike object, "
|
|
||||||
"not " + path_type.__name__)
|
|
||||||
- if isinstance(path_repr, (str, bytes)):
|
|
||||||
+ if isinstance(path_repr, (str, unicode, bytes)):
|
|
||||||
return path_repr
|
|
||||||
else:
|
|
||||||
raise TypeError("expected {}.__fspath__() to return str or bytes, "
|
|
||||||
"not {}".format(path_type.__name__,
|
|
||||||
- type(path_repr).__name__))
|
|
||||||
+ type(path_repr).__name__))
|
|
||||||
\ No newline at end of file
|
|
Ładowanie…
Reference in New Issue