Commit 27dd7c0c authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	HISTORY.rst
#	py_tools_ds/version.py
parents 91f34185 ee8e5a38
Pipeline #11749 canceled with stages
...@@ -63,7 +63,7 @@ test_py_tools_ds_install: ...@@ -63,7 +63,7 @@ test_py_tools_ds_install:
# - conda update -c conda-forge python # - conda update -c conda-forge python
# avoid package incompatibilities due to usage of wrong channels # avoid package incompatibilities due to usage of wrong channels
- conda config --set channel_priority strict # otherwise gdal or libgdal may be installed from defaults channel # - conda config --set channel_priority strict # otherwise gdal or libgdal may be installed from defaults channel
# resolve some requirements with conda # resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy gdal pyproj shapely geopandas - conda install --yes -q -c conda-forge numpy gdal pyproj shapely geopandas
......
...@@ -58,7 +58,7 @@ def get_GDAL_ds_inmem(array, gt=None, prj=None, nodata=None): ...@@ -58,7 +58,7 @@ def get_GDAL_ds_inmem(array, gt=None, prj=None, nodata=None):
if gdal_array.NumericTypeCodeToGDALTypeCode(array.dtype) is None: if gdal_array.NumericTypeCodeToGDALTypeCode(array.dtype) is None:
array = array.astype(dTypeDic_NumPy2GDALcompatible[str(np.dtype(array.dtype))]) array = array.astype(dTypeDic_NumPy2GDALcompatible[str(np.dtype(array.dtype))])
ds = gdal_array.OpenArray(array, prototype_ds=None, interleave='band') ds = gdal_array.OpenArray(array) # uses interleave='band' by default
if ds is None: if ds is None:
raise Exception(gdal.GetLastErrorMsg()) raise Exception(gdal.GetLastErrorMsg())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment