geoarray 0.18.0__tar.gz → 0.19.1__tar.gz

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

@@ -12,10 +12,6 @@ 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
@@ -67,22 +63,15 @@ 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
 
     # install geoarray
     - pip install -e .
-    - cd ..
-    - pwd
-
-    - ls
 
-    # test importability
+      # test importability
+    - cd ../..
     - python -c "import geoarray; print(geoarray)"
     - python -c "from geoarray import GeoArray"
 
@@ -132,7 +121,7 @@ deploy_pypi:
     - test_geoarray
   script:
     - source activate ci_env
-    - pip install -U twine build
+    - pip install -U twine build packaging
     - python -m build --sdist
     - twine check dist/*
     - twine upload dist/*  # requires creds as environment variables

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

@@ -2,6 +2,21 @@
 History
 =======
 
+0.19.1 (2025-05-26)
+-------------------
+
+* !57: Pinned holoviews to >1.12.7 to fix an incompatibility within newer environments.
+* !58: Fixed #47 (Integer overflow in GeoArray.read_pointData for rasters larger than int16 max (32767)).
+* !59: Adapted license declaration in pyproject.toml to new PEP 639.
+
+
+0.19.0 (26.08.2024)
+-------------------
+
+* !55: Updated CI runner to use the latest base image. Adapted build script to upstream changes of GitLab 17.0.
+* !56: Migrated setup procedure from using setup.py + setup.cfg to using pyproject.toml only.
+
+
 0.18.0 (05.07.2024)
 -------------------
 
@@ -11,11 +26,11 @@ History
 * !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.
+  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).
+  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).
 
 

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

@@ -1,15 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: geoarray
-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
-Author-email: danschef@gfz-potsdam.de
-License: Apache-2.0
+Version: 0.19.1
+Summary: Fast Python interface for geodata - either on disk or in memory
+Author-email: Daniel Scheffler <daniel.scheffler@gfz-potsdam.de>
+License-Expression: Apache-2.0
+Project-URL: Source code, https://git.gfz-potsdam.de/danschef/geoarray
+Project-URL: Issue Tracker, https://git.gfz-potsdam.de/danschef/geoarray/-/issues
+Project-URL: Documentation, https://danschef.git-pages.gfz-potsdam.de/geoarray/doc/
+Project-URL: Change log, https://git.gfz-potsdam.de/danschef/geoarray/-/blob/main/HISTORY.rst
 Keywords: geoarray,geoprocessing,gdal,numpy
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -32,20 +33,11 @@ Requires-Dist: shapely
 Provides-Extra: interactive-plotting
 Requires-Dist: folium; extra == "interactive-plotting"
 Requires-Dist: geojson; extra == "interactive-plotting"
-Requires-Dist: holoviews; extra == "interactive-plotting"
+Requires-Dist: holoviews>1.12.7; extra == "interactive-plotting"
 Provides-Extra: doc
 Requires-Dist: sphinx-argparse; extra == "doc"
 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>=3.8.0; extra == "test"
-Requires-Dist: matplotlib; extra == "test"
-Requires-Dist: numpy; extra == "test"
-Requires-Dist: pandas; extra == "test"
-Requires-Dist: py_tools_ds>=0.19.0; extra == "test"
-Requires-Dist: scikit-image; extra == "test"
-Requires-Dist: shapely; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-reporter-html1; extra == "test"
@@ -56,26 +48,10 @@ Requires-Dist: flake8; extra == "lint"
 Requires-Dist: pycodestyle; extra == "lint"
 Requires-Dist: pydocstyle; extra == "lint"
 Provides-Extra: dev
-Requires-Dist: setuptools-git; extra == "dev"
-Requires-Dist: cartopy>=0.20; extra == "dev"
-Requires-Dist: dill; 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"
-Requires-Dist: py_tools_ds>=0.19.0; extra == "dev"
-Requires-Dist: scikit-image; extra == "dev"
-Requires-Dist: shapely; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-reporter-html1; extra == "dev"
-Requires-Dist: urlchecker; extra == "dev"
-Requires-Dist: parameterized; extra == "dev"
-Requires-Dist: sphinx-argparse; extra == "dev"
-Requires-Dist: sphinx_rtd_theme; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: pycodestyle; extra == "dev"
-Requires-Dist: pydocstyle; extra == "dev"
+Requires-Dist: geoarray[test]; extra == "dev"
+Requires-Dist: geoarray[doc]; extra == "dev"
+Requires-Dist: geoarray[lint]; extra == "dev"
+Dynamic: license-file
 
 ========
 geoarray

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

@@ -1343,7 +1343,7 @@ class GeoArray(object):
         # check availability of 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.")
+                          "'conda install -c conda-forge 'holoviews>1.12.7''. Using non-interactive mode.")
             interactive = False
 
         if interactive and image2plot.ndim == 3:
@@ -1992,7 +1992,7 @@ class GeoArray(object):
                    (imXY[:, 0] >= self.columns) |\
                    (imXY[:, 1] >= self.rows)
 
-        imYX = np.fliplr(np.array(imXY)).astype(np.int16)
+        imYX = np.fliplr(np.array(imXY)).astype(np.int32)
 
         if imYX.size == 2:  # only one coordinate pair
             Y, X = imYX[0].tolist()

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

@@ -22,5 +22,5 @@
 # limitations under the License.
 
 
-__version__ = '0.18.0'
-__versionalias__ = '20240705.01'
+__version__ = '0.19.1'
+__versionalias__ = '20250526.01'

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

@@ -1,15 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: geoarray
-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
-Author-email: danschef@gfz-potsdam.de
-License: Apache-2.0
+Version: 0.19.1
+Summary: Fast Python interface for geodata - either on disk or in memory
+Author-email: Daniel Scheffler <daniel.scheffler@gfz-potsdam.de>
+License-Expression: Apache-2.0
+Project-URL: Source code, https://git.gfz-potsdam.de/danschef/geoarray
+Project-URL: Issue Tracker, https://git.gfz-potsdam.de/danschef/geoarray/-/issues
+Project-URL: Documentation, https://danschef.git-pages.gfz-potsdam.de/geoarray/doc/
+Project-URL: Change log, https://git.gfz-potsdam.de/danschef/geoarray/-/blob/main/HISTORY.rst
 Keywords: geoarray,geoprocessing,gdal,numpy
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -32,20 +33,11 @@ Requires-Dist: shapely
 Provides-Extra: interactive-plotting
 Requires-Dist: folium; extra == "interactive-plotting"
 Requires-Dist: geojson; extra == "interactive-plotting"
-Requires-Dist: holoviews; extra == "interactive-plotting"
+Requires-Dist: holoviews>1.12.7; extra == "interactive-plotting"
 Provides-Extra: doc
 Requires-Dist: sphinx-argparse; extra == "doc"
 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>=3.8.0; extra == "test"
-Requires-Dist: matplotlib; extra == "test"
-Requires-Dist: numpy; extra == "test"
-Requires-Dist: pandas; extra == "test"
-Requires-Dist: py_tools_ds>=0.19.0; extra == "test"
-Requires-Dist: scikit-image; extra == "test"
-Requires-Dist: shapely; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-reporter-html1; extra == "test"
@@ -56,26 +48,10 @@ Requires-Dist: flake8; extra == "lint"
 Requires-Dist: pycodestyle; extra == "lint"
 Requires-Dist: pydocstyle; extra == "lint"
 Provides-Extra: dev
-Requires-Dist: setuptools-git; extra == "dev"
-Requires-Dist: cartopy>=0.20; extra == "dev"
-Requires-Dist: dill; 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"
-Requires-Dist: py_tools_ds>=0.19.0; extra == "dev"
-Requires-Dist: scikit-image; extra == "dev"
-Requires-Dist: shapely; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-reporter-html1; extra == "dev"
-Requires-Dist: urlchecker; extra == "dev"
-Requires-Dist: parameterized; extra == "dev"
-Requires-Dist: sphinx-argparse; extra == "dev"
-Requires-Dist: sphinx_rtd_theme; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: pycodestyle; extra == "dev"
-Requires-Dist: pydocstyle; extra == "dev"
+Requires-Dist: geoarray[test]; extra == "dev"
+Requires-Dist: geoarray[doc]; extra == "dev"
+Requires-Dist: geoarray[lint]; extra == "dev"
+Dynamic: license-file
 
 ========
 geoarray

{geoarray-0.18.0 → geoarray-0.19.1}/geoarray.egg-info/SOURCES.txt

@@ -10,8 +10,7 @@ LICENSE
 MANIFEST.in
 Makefile
 README.rst
-setup.cfg
-setup.py
+pyproject.toml
 tox.ini
 .github/ISSUE_TEMPLATE.md
 docs/Makefile

geoarray-0.19.1/geoarray.egg-info/requires.txt

@@ -0,0 +1,35 @@
+cartopy>=0.20
+dill
+gdal>=3.8.0
+matplotlib
+numpy
+pandas
+py_tools_ds>=0.19.0
+scikit-image
+shapely
+
+[dev]
+geoarray[test]
+geoarray[doc]
+geoarray[lint]
+
+[doc]
+sphinx-argparse
+sphinx_rtd_theme
+
+[interactive_plotting]
+folium
+geojson
+holoviews>1.12.7
+
+[lint]
+flake8
+pycodestyle
+pydocstyle
+
+[test]
+pytest
+pytest-cov
+pytest-reporter-html1
+urlchecker
+parameterized

geoarray-0.19.1/pyproject.toml

@@ -0,0 +1,124 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# geoarray, A fast Python interface for image geodata - either on disk or in memory.
+#
+# Copyright (C) 2017-2023
+# - Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
+# - Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences Potsdam,
+#   Germany (https://www.gfz-potsdam.de/)
+#
+# This software was developed within the context of the GeoMultiSens project funded
+# by the German Federal Ministry of Education and Research
+# (project grant code: 01 IS 14 010 A-C).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   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,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[build-system]
+requires = [
+    "setuptools>=61.2",
+    "setuptools-git",
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "geoarray"
+description = "Fast Python interface for geodata - either on disk or in memory"
+authors = [{name = "Daniel Scheffler", email = "daniel.scheffler@gfz-potsdam.de"}]
+license = "Apache-2.0"
+license-files = ["LICEN[CS]E*", "AUTHORS.rst"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Natural Language :: English",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+keywords = [
+    "geoarray",
+    "geoprocessing",
+    "gdal",
+    "numpy"
+]
+requires-python = ">=3.8"
+dependencies = [
+    "cartopy>=0.20",  # older versions require pyepsg
+    "dill",
+    "gdal>=3.8.0",  # use of context managers
+    "matplotlib",
+    "numpy",
+    "pandas",
+    "py_tools_ds>=0.19.0",
+    "scikit-image",
+    "shapely",
+]
+dynamic = ["version"]
+
+[project.readme]
+file = "README.rst"
+content-type = "text/x-rst"
+
+[project.urls]
+"Source code" = "https://git.gfz-potsdam.de/danschef/geoarray"
+"Issue Tracker" = "https://git.gfz-potsdam.de/danschef/geoarray/-/issues"
+"Documentation" = "https://danschef.git-pages.gfz-potsdam.de/geoarray/doc/"
+"Change log" = "https://git.gfz-potsdam.de/danschef/geoarray/-/blob/main/HISTORY.rst"
+
+[project.optional-dependencies]
+interactive_plotting = [
+    "folium",
+    "geojson",
+    "holoviews>1.12.7",
+]
+doc = [
+    "sphinx-argparse",
+    "sphinx_rtd_theme",
+]
+test = [
+    "pytest",
+    "pytest-cov",
+    "pytest-reporter-html1",
+    "urlchecker",
+    "parameterized",
+]
+lint = [
+    "flake8",
+    "pycodestyle",
+    "pydocstyle",
+]
+dev = [
+    "geoarray[test]",
+    "geoarray[doc]",
+    "geoarray[lint]",
+]
+
+[tool.setuptools]
+zip-safe = false
+include-package-data = true
+
+[tool.setuptools.packages.find]
+exclude = [
+    "docs*",
+    "examples*",
+    "tests*",
+]
+namespaces = false
+
+[tool.setuptools.dynamic]
+version = {attr = "geoarray.version.__version__"}
+
+[tool.distutils.bdist_wheel]
+universal = 1

geoarray-0.19.1/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

geoarray-0.18.0/geoarray.egg-info/requires.txt

@@ -1,61 +0,0 @@
-cartopy>=0.20
-dill
-gdal>=3.8.0
-matplotlib
-numpy
-pandas
-py_tools_ds>=0.19.0
-scikit-image
-shapely
-
-[dev]
-setuptools-git
-cartopy>=0.20
-dill
-gdal>=3.8.0
-matplotlib
-numpy
-pandas
-py_tools_ds>=0.19.0
-scikit-image
-shapely
-pytest
-pytest-cov
-pytest-reporter-html1
-urlchecker
-parameterized
-sphinx-argparse
-sphinx_rtd_theme
-flake8
-pycodestyle
-pydocstyle
-
-[doc]
-sphinx-argparse
-sphinx_rtd_theme
-
-[interactive_plotting]
-folium
-geojson
-holoviews
-
-[lint]
-flake8
-pycodestyle
-pydocstyle
-
-[test]
-cartopy>=0.20
-dill
-gdal>=3.8.0
-matplotlib
-numpy
-pandas
-py_tools_ds>=0.19.0
-scikit-image
-shapely
-pytest
-pytest-cov
-pytest-reporter-html1
-urlchecker
-parameterized

geoarray-0.18.0/setup.cfg

@@ -1,23 +0,0 @@
-[bumpversion]
-current_version = 0.1.0
-commit = True
-tag = True
-
-[bumpversion:file:setup.py]
-search = version='{current_version}'
-replace = version='{new_version}'
-
-[bumpversion:file:geoarray/__init__.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
-
-[bdist_wheel]
-universal = 1
-
-[flake8]
-exclude = docs
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

geoarray-0.18.0/setup.py

@@ -1,106 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# geoarray, A fast Python interface for image geodata - either on disk or in memory.
-#
-# Copyright (C) 2017-2023
-# - Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
-# - Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences Potsdam,
-#   Germany (https://www.gfz-potsdam.de/)
-#
-# This software was developed within the context of the GeoMultiSens project funded
-# by the German Federal Ministry of Education and Research
-# (project grant code: 01 IS 14 010 A-C).
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   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,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from setuptools import setup, find_packages
-
-
-with open('README.rst') as readme_file:
-    readme = readme_file.read()
-
-with open('HISTORY.rst') as history_file:
-    history = history_file.read()
-
-version = {}
-with open("geoarray/version.py") as version_file:
-    exec(version_file.read(), version)
-
-req = [
-    'cartopy>=0.20',  # older versions require pyepsg
-    'dill',
-    'gdal>=3.8.0',  # use of context managers
-    'matplotlib',
-    'numpy',
-    'pandas',
-    'py_tools_ds>=0.19.0',
-    'scikit-image',
-    'shapely'
-    ]
-
-req_interactive_plotting = [
-    'folium',
-    'geojson',
-    'holoviews'
-]
-
-req_setup = ['setuptools-git']
-
-req_test = req + ["pytest", "pytest-cov", "pytest-reporter-html1", "urlchecker", "parameterized"]
-
-req_doc = ['sphinx-argparse', 'sphinx_rtd_theme']
-
-req_lint = ['flake8', 'pycodestyle', 'pydocstyle']
-
-req_dev = req_setup + req_test + req_doc + req_lint
-
-setup(
-    name='geoarray',
-    version=version['__version__'],
-    description="Fast Python interface for geodata - either on disk or in memory.",
-    long_description=readme,
-    long_description_content_type='text/x-rst',
-    author="Daniel Scheffler",
-    author_email='danschef@gfz-potsdam.de',
-    url='https://git.gfz-potsdam.de/danschef/geoarray',
-    packages=find_packages(exclude=['tests*']),  # searches for packages with an __init__.py and returns a list
-    package_dir={'geoarray': 'geoarray'},
-    include_package_data=True,
-    install_requires=req,
-    license="Apache-2.0",
-    zip_safe=False,
-    keywords=['geoarray', 'geoprocessing', 'gdal', 'numpy'],
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: Apache Software License',
-        'Natural Language :: English',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12'
-    ],
-    python_requires='>=3.8',
-    test_suite='tests',
-    tests_require=req_test,
-    setup_requires=req_setup,
-    extras_require={
-        "interactive_plotting": req_interactive_plotting,
-        "doc": req_doc,
-        "test": req_test,
-        "lint": req_lint,
-        "dev": req_dev
-    }
-)