Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Daniel Scheffler
py_tools_ds
Commits
27dd7c0c
Commit
27dd7c0c
authored
Aug 21, 2020
by
Daniel Scheffler
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into master
# Conflicts: # HISTORY.rst # py_tools_ds/version.py
parents
91f34185
ee8e5a38
Pipeline
#11749
canceled with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
.gitlab-ci.yml
.gitlab-ci.yml
+2
-2
py_tools_ds/io/raster/gdal.py
py_tools_ds/io/raster/gdal.py
+1
-1
No files found.
.gitlab-ci.yml
View file @
27dd7c0c
...
...
@@ -62,8 +62,8 @@ test_py_tools_ds_install:
-
conda update -n base -c defaults conda
# - conda update -c conda-forge python
# 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
# 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
# resolve some requirements with conda
-
conda install --yes -q -c conda-forge numpy gdal pyproj shapely geopandas
...
...
py_tools_ds/io/raster/gdal.py
View file @
27dd7c0c
...
...
@@ -58,7 +58,7 @@ def get_GDAL_ds_inmem(array, gt=None, prj=None, nodata=None):
if
gdal_array
.
NumericTypeCodeToGDALTypeCode
(
array
.
dtype
)
is
None
:
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
:
raise
Exception
(
gdal
.
GetLastErrorMsg
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment