diff --git a/configure_macos.sh b/configure_macos.sh index b86c5f30..596de7c6 100755 --- a/configure_macos.sh +++ b/configure_macos.sh @@ -51,9 +51,9 @@ install() { cmake .. && make -j$processes cd /tmp - pip download GDAL==3.5.1 - tar -xpzf GDAL-3.5.1.tar.gz - cd GDAL-3.5.1 + pip download GDAL==3.6.2 + tar -xpzf GDAL-3.6.2.tar.gz + cd GDAL-3.6.2 if [ -e /opt/homebrew/bin/gdal-config ]; then python setup.py build_ext --gdal-config /opt/homebrew/bin/gdal-config else @@ -61,7 +61,7 @@ install() { fi python setup.py build python setup.py install - rm -fr /tmp/GDAL-3.5.1 /tmp/GDAL-3.5.1.tar.gz + rm -fr /tmp/GDAL-3.6.2 /tmp/GDAL-3.6.2.tar.gz cd ${RUNPATH} diff --git a/requirements.txt b/requirements.txt index b9476391..10a80199 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,8 @@ beautifulsoup4==4.9.3 cloudpickle==1.6.0 edt==2.0.2 ODMExifRead==3.0.4 -Fiona==1.8.17 ; sys_platform == 'linux' or sys_platform == 'darwin' +Fiona==1.8.17 ; sys_platform == 'linux' +Fiona==1.9.1 ; sys_platform == 'darwin' https://github.com/OpenDroneMap/windows-deps/raw/main/Fiona-1.8.19-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' joblib==1.1.0 laspy[lazrs]==2.3.0 ; sys_platform == 'linux' or sys_platform == 'win32' @@ -20,7 +21,8 @@ pyproj==3.3.1 Pysolar==0.9 pytz==2020.4 PyYAML==5.1 -rasterio==1.2.3 ; sys_platform == 'linux' or sys_platform == 'darwin' +rasterio==1.2.3 ; sys_platform == 'linux' +rasterio==1.3.6 ; sys_platform == 'darwin' https://github.com/OpenDroneMap/windows-deps/raw/main/rasterio-1.2.3-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' https://github.com/OpenDroneMap/windows-deps/raw/main/GDAL-3.2.3-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' repoze.lru==0.7