fix GDAL/Numpy conflict by installing GDAL Python package from pip instead of apt

pull/1904/head
Nathan Olson 2025-09-15 11:36:44 -07:00
rodzic 137b1b09d5
commit fb6bd60e3e
3 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -134,7 +134,7 @@ installreqs() {
# edt requires numpy to build
venv/bin/pip install numpy==2.3.2
venv/bin/pip install -r requirements.txt
venv/bin/pip install -r requirements.txt --ignore-installed
#if [ ! -z "$GPU_INSTALL" ]; then
#fi
set +e

Wyświetl plik

@ -19,6 +19,8 @@ PyYAML==6.0.2
rasterio==1.4.3 ; sys_platform == 'linux'
rasterio==1.4.3 ; sys_platform == 'darwin'
https://github.com/OpenDroneMap/windows-deps/releases/download/2.6.0/rasterio-1.4.3-cp312-cp312-win_amd64.whl ; sys_platform == 'win32'
gdal[numpy]==3.8.4 ; sys_platform == 'linux'
gdal[numpy]==3.8.4 ; sys_platform == 'darwin'
https://github.com/OpenDroneMap/windows-deps/releases/download/2.6.0/gdal-3.11.1-cp312-cp312-win_amd64.whl ; sys_platform == 'win32'
repoze.lru==0.7
scikit-learn==1.7.1

Wyświetl plik

@ -46,7 +46,6 @@ parts:
- pkg-config
- pybind11-dev
- python3-dev
- python3-gdal
- python3-pip
- python3-setuptools
- python3-wheel
@ -63,7 +62,6 @@ parts:
- proj-data
- procps
- python3
- python3-gdal
- python3-pkg-resources # required base package for core20
- python3-requests # required base package for core20
- python3-setuptools