geoarray 0.17.2__tar.gz → 0.18.0__tar.gz

{geoarray-0.17.2 → geoarray-0.18.0}/.gitlab-ci.yml

@@ -12,6 +12,10 @@ test_geoarray:
   stage: test
   coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
   script:
+    # TODO remove as soon as CI runner is rebuilt
+    - mamba env remove -n ci_env
+    - mamba env create --name ci_env -f tests/CI_docker/context/environment_geoarray.yml
+
     - source activate ci_env
 
     # update py_tools_ds
@@ -63,6 +67,10 @@ test_geoarray_install:
   script:
     - mamba update -n base mamba conda
 
+    # TODO remove as soon as CI runner is rebuilt
+    - pip install --force-reinstall zstandard
+    - pip install --force-reinstall zstd
+
     # create geoarray environment from environment_geoarray.yml
     - mamba env create --name geoarray_test -f tests/CI_docker/context/environment_geoarray.yml
     - source activate geoarray_test
@@ -71,6 +79,7 @@ test_geoarray_install:
     - pip install -e .
     - cd ..
     - pwd
+
     - ls
 
     # test importability

{geoarray-0.17.2 → geoarray-0.18.0}/AUTHORS.rst

@@ -5,12 +5,9 @@ Credits
 Development Lead
 ----------------
 
-* Daniel Scheffler <danschef@gfz-potsdam.de>
-** <https://www.gfz-potsdam.de/staff/daniel.scheffler/sec14/>
-
+* `Daniel Scheffler <https://www.gfz-potsdam.de/staff/daniel.scheffler/sec14/>`__ <danschef@gfz-potsdam.de>
 
 Contributors
 ------------
 
 * Jessica Palka <jessica.palka@gfz-potsdam.de>
-

{geoarray-0.17.2 → geoarray-0.18.0}/CONTRIBUTING.rst

@@ -101,7 +101,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 3.8, 3.9, 3.10, and 3.11. Check
+3. The pull request should work for Python 3.8, 3.9, 3.10, 3.11, and 3.12. Check
    https://travis-ci.org/danschef/geoarray/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

{geoarray-0.17.2 → geoarray-0.18.0}/HISTORY.rst

@@ -2,6 +2,23 @@
 History
 =======
 
+0.18.0 (05.07.2024)
+-------------------
+
+* !47: Fixed missing handling of int64 input values for GDAL_Metadata.__getitem__
+  and improved coverage of GDAL_Metadata.
+* !48: Revised tests to use pytest plain assertions.
+* !49: Improved documentation of expected order of array dimensions (closes #43).
+* !50: Fixed #46 (Numpy 2.0 support: `can_cast` not supported for python dtypes).
+* !51: Fixed GDAL-3.9-related RuntimeError within GeoArray.save by using context managers.
+       Bumped minimal version of GDAL to 3.8 due to usage of context managers.
+* !52: Use GDAL context managers where ever possible.
+* Added official support for Python 3.12.
+* !53: Removed Test_GeoArray.test_show_map_noepsg because newer versions of pyproj do not
+       return None as EPSG code anymore (at least not with the given WKT).
+* !54: Fixed DeprecationWarning (replaced deprecated pkgutil.find_loader with importlib.util.find_spec).
+
+
 0.17.2 (23.11.2023)
 -------------------
 

{geoarray-0.17.2/geoarray.egg-info → geoarray-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geoarray
-Version: 0.17.2
+Version: 0.18.0
 Summary: Fast Python interface for geodata - either on disk or in memory.
 Home-page: https://git.gfz-potsdam.de/danschef/geoarray
 Author: Daniel Scheffler
@@ -15,13 +15,14 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: cartopy>=0.20
 Requires-Dist: dill
-Requires-Dist: gdal>=2.1.0
+Requires-Dist: gdal>=3.8.0
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pandas
@@ -38,7 +39,7 @@ Requires-Dist: sphinx_rtd_theme; extra == "doc"
 Provides-Extra: test
 Requires-Dist: cartopy>=0.20; extra == "test"
 Requires-Dist: dill; extra == "test"
-Requires-Dist: gdal>=2.1.0; extra == "test"
+Requires-Dist: gdal>=3.8.0; extra == "test"
 Requires-Dist: matplotlib; extra == "test"
 Requires-Dist: numpy; extra == "test"
 Requires-Dist: pandas; extra == "test"
@@ -58,7 +59,7 @@ Provides-Extra: dev
 Requires-Dist: setuptools-git; extra == "dev"
 Requires-Dist: cartopy>=0.20; extra == "dev"
 Requires-Dist: dill; extra == "dev"
-Requires-Dist: gdal>=2.1.0; extra == "dev"
+Requires-Dist: gdal>=3.8.0; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
@@ -155,7 +156,7 @@ open source packages that may cause problems when installed with pip. Therefore,
 to resolve the following dependencies before the pip installer is run:
 
     * cartopy >=0.20
-    * gdal >=2.1.0
+    * gdal >=3.8.0
     * geopandas
     * holoviews  # optional, in case you want to use interactive plotting
     * matplotlib

{geoarray-0.17.2 → geoarray-0.18.0}/README.rst

@@ -77,7 +77,7 @@ open source packages that may cause problems when installed with pip. Therefore,
 to resolve the following dependencies before the pip installer is run:
 
     * cartopy >=0.20
-    * gdal >=2.1.0
+    * gdal >=3.8.0
     * geopandas
     * holoviews  # optional, in case you want to use interactive plotting
     * matplotlib

{geoarray-0.17.2 → geoarray-0.18.0}/examples/notebooks/features_and_usage.ipynb

@@ -64,7 +64,7 @@
     "from geoarray import GeoArray\n",
     "import numpy as np\n",
     "\n",
-    "testarray = np.random.randint(1,10, (250, 250, 8))\n",
+    "testarray = np.random.randint(1,10, (250, 250, 8))  # (250 rows, 250 columns, 8 bands)\n",
     "\n",
     "gA = GeoArray(testarray,\n",
     "              geotransform=[640605.0, 30.0, -0.0, 5754285.0, -0.0, -30.0],\n",
@@ -767,4 +767,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

{geoarray-0.17.2 → geoarray-0.18.0}/geoarray/__init__.py

@@ -15,7 +15,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+#   https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,6 +24,7 @@
 # limitations under the License.
 
 import os
+from osgeo import gdal as _gdal
 if 'MPLBACKEND' not in os.environ:
     os.environ['MPLBACKEND'] = 'Agg'
 
@@ -47,6 +48,9 @@ __all__ = ['__version__',
            'CloudMask'
            ]
 
+# enable GDAL exceptions
+_gdal.UseExceptions()
+
 # $PROJ_LIB was renamed to $PROJ_DATA in proj=9.1.1, which leads to issues with fiona>=1.8.20,<1.9
 # https://github.com/conda-forge/pyproj-feedstock/issues/130
 # -> fix it by setting PROJ_DATA

{geoarray-0.17.2 → geoarray-0.18.0}/geoarray/baseclasses.py

@@ -15,7 +15,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+#   https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +26,7 @@
 
 import os
 import warnings
-from pkgutil import find_loader
+from importlib.util import find_spec
 from collections import OrderedDict
 from copy import copy, deepcopy
 from numbers import Number
@@ -104,7 +104,7 @@ class GeoArray(object):
                  ) -> None:
         """Get an instance of GeoArray.
 
-        :param path_or_array:   a numpy.ndarray or a valid file path
+        :param path_or_array:   a numpy.ndarray (rows, columns, bands) or a valid file path
         :param geotransform:    GDAL geotransform of the given array or file on disk
         :param projection:      projection of the given array or file on disk as WKT string
                                 (only needed if GeoArray is instanced with an array)
@@ -321,7 +321,7 @@ class GeoArray(object):
 
     @geotransform.setter
     def geotransform(self, gt: Union[tuple, list]):
-        assert isinstance(gt, (list, tuple)) and len(gt) == 6,\
+        assert isinstance(gt, (list, tuple)) and len(gt) == 6, \
             'geotransform must be a list with 6 numbers. Got %s.' % str(gt)
 
         for i in gt:
@@ -549,7 +549,7 @@ class GeoArray(object):
             # assert self._footprint_poly
             # for XY in self.corner_coord:
             #    assert self.GeoArray.box.mapPoly.contains(Point(XY)) or self.GeoArray.box.mapPoly.touches(Point(XY)), \
-            #        "The corner position '%s' is outside of the %s." % (XY, self.imName)
+            #        "The corner position '%s' is outside the %s." % (XY, self.imName)
 
         return self._footprint_poly
 
@@ -823,42 +823,40 @@ class GeoArray(object):
         """
         if not self._gdalDataset_meta_already_set:
             assert self.filePath
-            ds = gdal.Open(self.filePath)
-            if not ds:
-                raise Exception('Error reading file:  ' + gdal.GetLastErrorMsg())
 
-            # set private class variables (in order to avoid recursion error)
-            self._shape = tuple([ds.RasterYSize, ds.RasterXSize] + ([ds.RasterCount] if ds.RasterCount > 1 else []))
-            self._dtype = gdal_array.GDALTypeCodeToNumericTypeCode(ds.GetRasterBand(1).DataType)
-            self._geotransform = list(ds.GetGeoTransform())
+            with gdal.Open(self.filePath) as ds:
+                if not ds:
+                    raise Exception('Error reading file:  ' + gdal.GetLastErrorMsg())
 
-            # for some reason GDAL reads arbitrary geotransforms as (0, 1, 0, 0, 0, 1) instead of (0, 1, 0, 0, 0, -1)
-            self._geotransform[5] = -abs(self._geotransform[5])  # => force ygsd to be negative
+                # set private class variables (in order to avoid recursion error)
+                self._shape = tuple([ds.RasterYSize, ds.RasterXSize] + ([ds.RasterCount] if ds.RasterCount > 1 else []))
+                self._dtype = gdal_array.GDALTypeCodeToNumericTypeCode(ds.GetRasterBand(1).DataType)
+                self._geotransform = list(ds.GetGeoTransform())
 
-            # consequently use WKT1 strings here as GDAL always exports transformation results as WKT1
-            wkt = ds.GetProjection()
-            self._projection = CRS(wkt).to_wkt(version="WKT1_GDAL") if not isLocal(wkt) else ''
+                # somehow GDAL reads arbitrary geotransforms as (0, 1, 0, 0, 0, 1) instead of (0, 1, 0, 0, 0, -1)
+                self._geotransform[5] = -abs(self._geotransform[5])  # => force ygsd to be negative
 
-            if 'nodata' not in self._initParams or self._initParams['nodata'] is None:
-                band = ds.GetRasterBand(1)
-                # FIXME this does not support different nodata values within the same file
-                self.nodata = band.GetNoDataValue()
-                self.nodata = band.GetNoDataValue()
+                # consequently use WKT1 strings here as GDAL always exports transformation results as WKT1
+                wkt = ds.GetProjection()
+                self._projection = CRS(wkt).to_wkt(version="WKT1_GDAL") if not isLocal(wkt) else ''
 
-            # set metadata attribute
-            if self.is_inmem or not self.filePath:
-                # metadata cannot be read from disk -> set it to the default
-                self._metadata = GDAL_Metadata(nbands=self.bands, nodata_allbands=self._nodata)
+                if 'nodata' not in self._initParams or self._initParams['nodata'] is None:
+                    band = ds.GetRasterBand(1)
+                    # FIXME this does not support different nodata values within the same file
+                    self.nodata = band.GetNoDataValue()
+                    self.nodata = band.GetNoDataValue()
 
-            else:
-                self._metadata = GDAL_Metadata(filePath=self.filePath)
+                # set metadata attribute
+                if self.is_inmem or not self.filePath:
+                    # metadata cannot be read from disk -> set it to the default
+                    self._metadata = GDAL_Metadata(nbands=self.bands, nodata_allbands=self._nodata)
 
-            # copy over the band names
-            if 'band_names' in self.metadata.band_meta and self.metadata.band_meta['band_names']:
-                self.bandnames = self.metadata.band_meta['band_names']
+                else:
+                    self._metadata = GDAL_Metadata(filePath=self.filePath)
 
-            # noinspection PyUnusedLocal
-            ds = None
+                # copy over the band names
+                if 'band_names' in self.metadata.band_meta and self.metadata.band_meta['band_names']:
+                    self.bandnames = self.metadata.band_meta['band_names']
 
         self._gdalDataset_meta_already_set = True
 
@@ -871,12 +869,11 @@ class GeoArray(object):
         :param getitem_params:  a list of slices in the form [row_slice, col_slice, band_slice]
         :return out_arr:        the output array
         """
-        ds = gdal.Open(path)
-        if not ds:
-            raise Exception('Error reading file:  ' + gdal.GetLastErrorMsg())
+        with gdal.Open(path) as ds:
+            if not ds:
+                raise Exception('Error reading file:  ' + gdal.GetLastErrorMsg())
 
-        R, C, B = ds.RasterYSize, ds.RasterXSize, ds.RasterCount
-        del ds
+            R, C, B = ds.RasterYSize, ds.RasterXSize, ds.RasterCount
 
         # convert getitem_params to subset area to be read #
         rS, rE, cS, cE, bS, bE, bL = [None] * 7
@@ -996,23 +993,21 @@ class GeoArray(object):
                 if out_arr is None:
                     raise Exception('Error reading file:  ' + gdal.GetLastErrorMsg())
             else:
-                ds = gdal.Open(path)
-                if len(bL) == 1:
-                    band = ds.GetRasterBand(bL[0] + 1)
-                    out_arr = band.ReadAsArray(cS, rS, cE - cS + 1, rE - rS + 1)
-                    if out_arr is None:
-                        raise Exception('Error reading file:  ' + gdal.GetLastErrorMsg())
-                    del band
-                else:
-                    out_arr = np.empty((rE - rS + 1, cE - cS + 1, len(bL)))
-                    for i, bIdx in enumerate(bL):
-                        band = ds.GetRasterBand(bIdx + 1)
-                        out_arr[:, :, i] = band.ReadAsArray(cS, rS, cE - cS + 1, rE - rS + 1)
+                with gdal.Open(path) as ds:
+                    if len(bL) == 1:
+                        band = ds.GetRasterBand(bL[0] + 1)
+                        out_arr = band.ReadAsArray(cS, rS, cE - cS + 1, rE - rS + 1)
                         if out_arr is None:
                             raise Exception('Error reading file:  ' + gdal.GetLastErrorMsg())
                         del band
-
-                del ds
+                    else:
+                        out_arr = np.empty((rE - rS + 1, cE - cS + 1, len(bL)))
+                        for i, bIdx in enumerate(bL):
+                            band = ds.GetRasterBand(bIdx + 1)
+                            out_arr[:, :, i] = band.ReadAsArray(cS, rS, cE - cS + 1, rE - rS + 1)
+                            if out_arr is None:
+                                raise Exception('Error reading file:  ' + gdal.GetLastErrorMsg())
+                            del band
 
             out_arr = _ensure_np_shape_consistency_3D_2D(out_arr)
 
@@ -1076,111 +1071,102 @@ class GeoArray(object):
         #########################################
         # write output dataset and set metadata #
         #########################################
+        with gdal.config_options(
+            dict(
+                GDAL_PAM_ENABLED='NO',  # disable to write separate metadata XML files
+            )
+        ):
 
-        try:
             # ENVI #
             ########
             if fmt == 'ENVI':
-                # NOTE:  The dataset has to be written BEFORE metadata are added. Otherwise, metadata are not written.
+                # NOTE:  The dataset must be written BEFORE metadata are added. Otherwise, metadata are not written.
 
                 # write ds_src to disk and re-open it to add the metadata
                 gdal.Translate(out_path, ds_src, format=fmt, creationOptions=creationOptions)
                 del ds_src
-                # os.environ['GDAL_PAM_ENABLED'] = 'NO'
-                ds_out = gdal.Open(out_path, gdal.GA_Update)
-
-                for bidx in range(self.bands):
-                    band = ds_out.GetRasterBand(bidx + 1)
-
-                    if 'band_names' in envi_metadict:
-                        bandname = str(self.metadata.band_meta['band_names'][bidx]).strip()
-                        band.SetDescription(bandname)
-                        assert band.GetDescription() == bandname
 
-                    del band
+                with gdal.Open(out_path, gdal.GA_Update) as ds_out:
 
-                # avoid that band names are written to global meta
-                if 'band_names' in envi_metadict:
-                    del envi_metadict['band_names']
+                    for bidx in range(self.bands):
+                        band = ds_out.GetRasterBand(bidx + 1)
 
-                # the expected key name is 'data_ignore_value', see below
-                if 'nodata' in envi_metadict:
-                    del envi_metadict['nodata']
+                        if 'band_names' in envi_metadict:
+                            bandname = str(self.metadata.band_meta['band_names'][bidx]).strip()
+                            band.SetDescription(bandname)
+                            assert band.GetDescription() == bandname
 
-                # set data_ignore_value in case self.metadata.band_meta contains a unique nodata value
-                if 'nodata' in self.metadata.band_meta:
-                    if len(set(self.metadata.band_meta['nodata'])) == 1:
-                        envi_metadict['data_ignore_value'] = str(self.metadata.band_meta['nodata'][0])
-                    else:
-                        warnings.warn("Band-specific nodata values are not supported by the ENVI header format.")
+                    # avoid that band names are written to global meta
+                    if 'band_names' in envi_metadict:
+                        del envi_metadict['band_names']
 
-                ds_out.SetMetadata(envi_metadict, 'ENVI')
+                    # the expected key name is 'data_ignore_value', see below
+                    if 'nodata' in envi_metadict:
+                        del envi_metadict['nodata']
 
-                if 'description' in envi_metadict:
-                    ds_out.SetDescription(envi_metadict['description'])
+                    # set data_ignore_value in case self.metadata.band_meta contains a unique nodata value
+                    if 'nodata' in self.metadata.band_meta:
+                        if len(set(self.metadata.band_meta['nodata'])) == 1:
+                            envi_metadict['data_ignore_value'] = str(self.metadata.band_meta['nodata'][0])
+                        else:
+                            warnings.warn("Band-specific nodata values are not supported "
+                                          "by the ENVI header format.")
 
-                ds_out.FlushCache()
+                    ds_out.SetMetadata(envi_metadict, 'ENVI')
 
-                # NOTE: In case of ENVI format and GDAL_PAM_ENABLED=NO, the metadata is not written
-                gdal.Unlink(out_path + '.aux.xml')
+                    if 'description' in envi_metadict:
+                        ds_out.SetDescription(envi_metadict['description'])
 
             else:
-                # disable to write separate metadata XML files
-                os.environ['GDAL_PAM_ENABLED'] = 'NO'
-
-                ds_out = ds_src
-
-                # set metadata
-                if self.metadata.all_meta:
-
-                    # set global domain metadata
-                    if self.metadata.global_meta:
-                        ds_out.SetMetadata(dict((k, repr(v)) for k, v in self.metadata.global_meta.items()))
+                try:
+                    ds_out = ds_src
+                    del ds_src
 
-                    if 'description' in envi_metadict:
-                        ds_out.SetDescription(envi_metadict['description'])
+                    # set metadata
+                    if self.metadata.all_meta:
 
-                    # set band domain metadata
-                    bandmeta_dict = self.metadata.to_DataFrame().astype(str).to_dict()
+                        # set global domain metadata
+                        if self.metadata.global_meta:
+                            ds_out.SetMetadata(dict((k, repr(v)) for k, v in self.metadata.global_meta.items()))
 
-                    for bidx in range(self.bands):
-                        band = ds_out.GetRasterBand(bidx + 1)
-                        bandmeta = bandmeta_dict[bidx].copy()
+                        if 'description' in envi_metadict:
+                            ds_out.SetDescription(envi_metadict['description'])
 
-                        # filter global metadata out
-                        bandmeta = {k: v for k, v in bandmeta.items() if k not in self.metadata.global_meta}
-                        # meta2write = dict((k, repr(v)) for k, v in self.metadata.band_meta.items() if v is not np.nan)
+                        # set band domain metadata
+                        bandmeta_dict = self.metadata.to_DataFrame().astype(str).to_dict()
 
-                        if 'band_names' in bandmeta:
-                            bandname = str(self.metadata.band_meta['band_names'][bidx]).strip()
-                            band.SetDescription(bandname)
-                            del bandmeta['band_names']
+                        for bidx in range(self.bands):
+                            band = ds_out.GetRasterBand(bidx + 1)
+                            bandmeta = bandmeta_dict[bidx].copy()
 
-                        if 'nodata' in bandmeta:
-                            band.SetNoDataValue(self.metadata.band_meta['nodata'][bidx])
-                            del bandmeta['nodata']
+                            # filter global metadata out
+                            bandmeta = {k: v for k, v in bandmeta.items() if k not in self.metadata.global_meta}
+                            # meta2write = dict((k, repr(v))
+                            #                   for k, v in self.metadata.band_meta.items() if v is not np.nan)
 
-                        if bandmeta:
-                            band.SetMetadata(bandmeta)
+                            if 'band_names' in bandmeta:
+                                bandname = str(self.metadata.band_meta['band_names'][bidx]).strip()
+                                band.SetDescription(bandname)
+                                del bandmeta['band_names']
 
-                        band.FlushCache()
-                        del band
+                            if 'nodata' in bandmeta:
+                                band.SetNoDataValue(self.metadata.band_meta['nodata'][bidx])
+                                del bandmeta['nodata']
 
-                    ds_out.FlushCache()
+                            if bandmeta:
+                                band.SetMetadata(bandmeta)
 
-                # write ds_out to disk,
-                # -> writes the in-memory array or transforms the linked dataset into the target format
-                gdal.Translate(out_path, ds_out, format=fmt, creationOptions=creationOptions)
-                del ds_src
+                        ds_out.FlushCache()
 
-        finally:
-            if 'GDAL_PAM_ENABLED' in os.environ:
-                del os.environ['GDAL_PAM_ENABLED']
+                    # write ds_out to disk,
+                    # -> writes the in-memory array or transforms the linked dataset into the target format
+                    gdal.Translate(out_path, ds_out, format=fmt, creationOptions=creationOptions)
 
-            if not os.path.exists(out_path):
-                raise Exception(gdal.GetLastErrorMsg())
+                finally:
+                    del ds_out
 
-            del ds_out
+        if not os.path.exists(out_path):
+            raise Exception(gdal.GetLastErrorMsg())
 
     def dump(self, out_path: str) -> None:
         """Serialize the whole object instance to disk using dill."""
@@ -1215,10 +1201,14 @@ class GeoArray(object):
         xdim, ydim = None, None
         in_nodata = nodataVal if nodataVal is not None else self.nodata
         out_nodata = in_nodata if in_nodata is not None else -9999
-        if not np.can_cast(out_nodata, image2plot.dtype):
-            image2plot = image2plot.astype(np.int32)
-        if image2plot.dtype == bool:
-            image2plot = image2plot.astype(int)
+
+        # use meaningful numeric data type for output image, compatible to the output nodata value
+        out_dtype = np.result_type(np.array(out_nodata), image2plot)
+        if not np.can_cast(out_dtype, np.float32):
+            out_dtype = np.float32  # more than float32 is not needed
+        elif out_dtype == bool:
+            out_dtype = int
+        image2plot = image2plot.astype(out_dtype)
 
         # rotated images always have to be resampled for plotting
         if not ignore_rotation and self.is_rotated:
@@ -1351,7 +1341,7 @@ class GeoArray(object):
             image2plot = np.ma.masked_equal(image2plot, nodataVal)
 
         # check availability of holoviews
-        if interactive and not find_loader('holoviews'):
+        if interactive and not find_spec('holoviews'):
             warnings.warn("Interactive mode requires holoviews. Install it by running, e.g., "
                           "'conda install -c conda-forge holoviews'. Using non-interactive mode.")
             interactive = False
@@ -1507,7 +1497,7 @@ class GeoArray(object):
 
     def show_footprint(self):
         """Show a web map containing the computed footprint of the GeoArray instance in a Jupyter notebook."""
-        if not find_loader('folium') or not find_loader('geojson'):
+        if not find_spec('folium') or not find_spec('geojson'):
             raise ImportError(
                 "This method requires the libraries 'folium' and 'geojson'. They can be installed with "
                 "the shell command 'pip install folium geojson'.")
@@ -1554,7 +1544,7 @@ class GeoArray(object):
         image2plot = data
 
         plt.figure(figsize=figsize)
-        plt.hist(list(image2plot.flat), density=normed, bins=bins, color='gray', range=[vmin, vmax])
+        plt.hist(list(image2plot.flat), density=normed, bins=bins, color='gray', range=(vmin, vmax))
         plt.xlabel('Pixel value')
         plt.ylabel('Probabilty' if normed else 'Count')
         plt.show()
@@ -1761,7 +1751,7 @@ class GeoArray(object):
         """Return the array data of GeoArray at a given geographic position.
 
         NOTE: The given mapBounds are snapped to the pixel grid of GeoArray. If the given mapBounds include areas
-              outside of the extent of GeoArray, these areas are filled with the fill value of GeoArray.
+              outside the extent of GeoArray, these areas are filled with the fill value of GeoArray.
 
         :param mapBounds:       xmin, ymin, xmax, ymax
         :param mapBounds_prj:   WKT projection string or EPSG code corresponding to mapBounds
@@ -1980,7 +1970,7 @@ class GeoArray(object):
                                     coordinates.
         :param band:                the band index of the band of interest. If None, the values of all bands are
                                     returned.
-        :param offside_val:         fill value in case input coordinates are geographically outside of the GeoArray
+        :param offside_val:         fill value in case input coordinates are geographically outside the GeoArray
                                     instance
         :return:                    - int in case only a singe coordinate is passed
                                     - np.ndarray with shape [Nx1] in case only one band is requested

{geoarray-0.17.2 → geoarray-0.18.0}/geoarray/masks.py

@@ -15,7 +15,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+#   https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

{geoarray-0.17.2 → geoarray-0.18.0}/geoarray/metadata.py

@@ -15,7 +15,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+#   https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -160,9 +160,7 @@ class GDAL_Metadata(object):
            not filePath.startswith('NETCDF'):
             raise FileNotFoundError(filePath)
 
-        ds = gdal.Open(filePath)
-
-        try:
+        with gdal.Open(filePath) as ds:
             if not ds:
                 raise Exception('Error reading file:  ' + gdal.GetLastErrorMsg())
 
@@ -230,9 +228,6 @@ class GDAL_Metadata(object):
                     # self.df[b] = meta_gs
                     del band
 
-        finally:
-            del ds
-
         return self.all_meta
 
     def __repr__(self) -> str:
@@ -251,7 +246,21 @@ class GDAL_Metadata(object):
         # subset bands
         if bands2extract is not None:
             if isinstance(bands2extract, list):
-                bands2extract = np.array(bands2extract)
+                if not len(set([type(i) for i in bands2extract])) == 1:
+                    raise ValueError("List items of 'bands2extract' should all have the same type.")
+                if not isinstance(bands2extract[0], str):
+                    bands2extract = np.array(bands2extract)
+                else:
+                    if 'band_names' not in meta_sub.band_meta:
+                        raise ValueError('String input is only supported if band names are set.')
+                    bandnames = meta_sub.band_meta['band_names']
+                    out = []
+                    for b in bands2extract:
+                        if b in bandnames:
+                            out.append(bandnames.index(b))
+                        else:
+                            raise ValueError(f"'{b}' is not a valid band name.")
+                    bands2extract = np.array(out)
             elif isinstance(bands2extract, (np.ndarray, slice)):
                 pass  # all fine
             else:
@@ -267,6 +276,9 @@ class GDAL_Metadata(object):
 
         # subset metadata keys
         if keys2extract:
+            if isinstance(keys2extract, list) and not list(set([type(i) for i in keys2extract])) == [str]:
+                raise ValueError("List items of 'keys2extract' should all be of type string.")
+
             keys2extract = [keys2extract] if isinstance(keys2extract, str) else keys2extract
 
             # global_meta = meta_sub.global_meta.copy()
@@ -284,22 +296,22 @@ class GDAL_Metadata(object):
         return meta_sub
 
     def __getitem__(self, given: Union[int, slice, str, list, np.ndarray]) -> 'GDAL_Metadata':
-        if isinstance(given, int):
+        if isinstance(given, (int, np.integer)):
             return self.get_subset(bands2extract=slice(given, given + 1))
         elif isinstance(given, slice):
             return self.get_subset(bands2extract=given)
         elif isinstance(given, str):
-            return self.get_subset(keys2extract=given)
+            return self.get_subset(bands2extract=[given])
         elif isinstance(given, list):
             if isinstance(given[0], str):
-                return self.get_subset(keys2extract=given)
-            elif isinstance(given[0], int):
+                return self.get_subset(bands2extract=given)
+            elif isinstance(given[0], (int, np.integer)):
                 return self.get_subset(bands2extract=given)
             else:
                 raise TypeError(given, 'Given list must contain string or integer items.')
         elif isinstance(given, np.ndarray):
             if given.ndim != 1:
-                raise TypeError(given, 'Given numpy array must be one-dimensional.')
+                raise ValueError(given, 'Given numpy array must be one-dimensional.')
             return self.get_subset(bands2extract=given)
         else:
             raise TypeError(given)

{geoarray-0.17.2 → geoarray-0.18.0}/geoarray/subsetting.py

@@ -15,7 +15,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+#   https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

{geoarray-0.17.2 → geoarray-0.18.0}/geoarray/version.py

@@ -13,7 +13,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+#   https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,5 +22,5 @@
 # limitations under the License.
 
 
-__version__ = '0.17.2'
-__versionalias__ = '20231123.01'
+__version__ = '0.18.0'
+__versionalias__ = '20240705.01'

{geoarray-0.17.2 → geoarray-0.18.0/geoarray.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geoarray
-Version: 0.17.2
+Version: 0.18.0
 Summary: Fast Python interface for geodata - either on disk or in memory.
 Home-page: https://git.gfz-potsdam.de/danschef/geoarray
 Author: Daniel Scheffler
@@ -15,13 +15,14 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: cartopy>=0.20
 Requires-Dist: dill
-Requires-Dist: gdal>=2.1.0
+Requires-Dist: gdal>=3.8.0
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pandas
@@ -38,7 +39,7 @@ Requires-Dist: sphinx_rtd_theme; extra == "doc"
 Provides-Extra: test
 Requires-Dist: cartopy>=0.20; extra == "test"
 Requires-Dist: dill; extra == "test"
-Requires-Dist: gdal>=2.1.0; extra == "test"
+Requires-Dist: gdal>=3.8.0; extra == "test"
 Requires-Dist: matplotlib; extra == "test"
 Requires-Dist: numpy; extra == "test"
 Requires-Dist: pandas; extra == "test"
@@ -58,7 +59,7 @@ Provides-Extra: dev
 Requires-Dist: setuptools-git; extra == "dev"
 Requires-Dist: cartopy>=0.20; extra == "dev"
 Requires-Dist: dill; extra == "dev"
-Requires-Dist: gdal>=2.1.0; extra == "dev"
+Requires-Dist: gdal>=3.8.0; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
@@ -155,7 +156,7 @@ open source packages that may cause problems when installed with pip. Therefore,
 to resolve the following dependencies before the pip installer is run:
 
     * cartopy >=0.20
-    * gdal >=2.1.0
+    * gdal >=3.8.0
     * geopandas
     * holoviews  # optional, in case you want to use interactive plotting
     * matplotlib

{geoarray-0.17.2 → geoarray-0.18.0}/geoarray.egg-info/requires.txt

@@ -1,6 +1,6 @@
 cartopy>=0.20
 dill
-gdal>=2.1.0
+gdal>=3.8.0
 matplotlib
 numpy
 pandas
@@ -12,7 +12,7 @@ shapely
 setuptools-git
 cartopy>=0.20
 dill
-gdal>=2.1.0
+gdal>=3.8.0
 matplotlib
 numpy
 pandas
@@ -47,7 +47,7 @@ pydocstyle
 [test]
 cartopy>=0.20
 dill
-gdal>=2.1.0
+gdal>=3.8.0
 matplotlib
 numpy
 pandas

{geoarray-0.17.2 → geoarray-0.18.0}/setup.py

@@ -16,7 +16,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+#   https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -40,7 +40,7 @@ with open("geoarray/version.py") as version_file:
 req = [
     'cartopy>=0.20',  # older versions require pyepsg
     'dill',
-    'gdal>=2.1.0',
+    'gdal>=3.8.0',  # use of context managers
     'matplotlib',
     'numpy',
     'pandas',
@@ -89,7 +89,8 @@ setup(
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11'
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12'
     ],
     python_requires='>=3.8',
     test_suite='tests',