geoarray 0.17.0__tar.gz → 0.17.1__tar.gz

{geoarray-0.17.0 → geoarray-0.17.1}/.gitlab-ci.yml

@@ -12,10 +12,10 @@ test_geoarray:
   stage: test
   coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
   script:
-    - source /root/mambaforge/bin/activate ci_env
+    - source activate ci_env
 
     # update py_tools_ds
-    - pip install -U py_tools_ds -q
+    - mamba update py_tools_ds
 
     # run tests
     - make pytest
@@ -39,7 +39,7 @@ test_geoarray:
 test_styles:
   stage: test
   script:
-    - source /root/mambaforge/bin/activate ci_env
+    - source activate ci_env
     - make lint
   artifacts:
     paths:
@@ -52,7 +52,7 @@ test_styles:
 test_urls:
   stage: test
   script:
-    - source /root/mambaforge/bin/activate ci_env
+    - source activate ci_env
     - pip install -U urlchecker
     - make urlcheck
   when: always
@@ -61,12 +61,11 @@ test_urls:
 test_geoarray_install:
   stage: test
   script:
-    - source /root/mambaforge/bin/activate
-    - mamba update -n base -c conda-forge --all
+    - mamba update -n base mamba conda
 
     # create geoarray environment from environment_geoarray.yml
     - mamba env create --name geoarray_test -f tests/CI_docker/context/environment_geoarray.yml
-    - conda activate geoarray_test
+    - source activate geoarray_test
 
     # install geoarray
     - pip install -e .
@@ -77,6 +76,9 @@ test_geoarray_install:
     # test importability
     - python -c "import geoarray; print(geoarray)"
     - python -c "from geoarray import GeoArray"
+
+    # check if dependencies are properly installed
+    - pip check || exit
   only:
     - main
 
@@ -120,9 +122,10 @@ deploy_pypi:
   dependencies:
     - test_geoarray
   script:
-    - source /root/mambaforge/bin/activate ci_env
-    - pip install -U twine
-    - python setup.py sdist
+    - source activate ci_env
+    - pip install -U twine build
+    - python -m build --sdist
+    - twine check dist/*
     - twine upload dist/*  # requires creds as environment variables
   only:
     - /^v\d+\.\d+\.\d+([abc]\d*)?$/  # PEP-440 compliant version (tags)

{geoarray-0.17.0 → geoarray-0.17.1}/HISTORY.rst

@@ -2,6 +2,13 @@
 History
 =======
 
+0.17.1 (03.11.2023)
+-------------------
+
+* !44: Updated CI to use Ubuntu-based runner. Revised environment_geoarray.yml.
+* !45: Added parameter 'draw_gridlines' to GeoArray.show_map() to allow users to control it by their own.
+
+
 0.17.0 (15.06.2023)
 -------------------
 

{geoarray-0.17.0 → geoarray-0.17.1}/Makefile

@@ -108,14 +108,14 @@ servedocs: docs ## compile the docs watching for changes
 release: dist ## package and upload a release
 	twine upload dist/*
 
-dist: clean ## builds source and wheel package
-	python setup.py sdist
-	python setup.py bdist_wheel
+dist: clean ## builds source package (requires twine and build)
+	python -m build --sdist
+	twine check dist/*
 	ls -l dist
 
 install: clean ## install the package to the active Python's site-packages
 	pip install -r requirements.txt
-	python setup.py install
+	pip install .
 
 gitlab_CI_docker:  ## Build a docker image for CI use within gitlab
 	cd ./tests/CI_docker/; bash ./build_testsuite_image.sh

{geoarray-0.17.0/geoarray.egg-info → geoarray-0.17.1}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: geoarray
-Version: 0.17.0
+Version: 0.17.1
 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
 Keywords: geoarray,geoprocessing,gdal,numpy
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -17,13 +16,65 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
-Provides-Extra: interactive_plotting
+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: matplotlib
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: py_tools_ds>=0.19.0
+Requires-Dist: scikit-image
+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"
 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>=2.1.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"
+Requires-Dist: urlchecker; extra == "test"
+Requires-Dist: parameterized; extra == "test"
 Provides-Extra: lint
+Requires-Dist: flake8; extra == "lint"
+Requires-Dist: pycodestyle; extra == "lint"
+Requires-Dist: pydocstyle; extra == "lint"
 Provides-Extra: dev
-License-File: LICENSE
-License-File: AUTHORS.rst
+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: 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"
 
 ========
 geoarray
@@ -143,5 +194,3 @@ This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypack
 .. _here: https://git.gfz-potsdam.de/danschef/geoarray/-/blob/main/examples/notebooks/features_and_usage.ipynb
 .. _pip: https://pip.pypa.io
 .. _Python installation guide: http://docs.python-guide.org/en/latest/starting/installation/
-
-

{geoarray-0.17.0 → geoarray-0.17.1}/geoarray/baseclasses.py

@@ -29,6 +29,7 @@ import warnings
 from pkgutil import find_loader
 from collections import OrderedDict
 from copy import copy, deepcopy
+from numbers import Number
 from typing import Union, Optional, Sequence, List, Tuple, Iterable, TYPE_CHECKING  # noqa F401
 
 import numpy as np
@@ -666,7 +667,7 @@ class GeoArray(object):
             getitem_params = [given] if isinstance(given, slice) else given
             return self.from_path(self.filePath, getitem_params)
 
-    def __setitem__(self, idx: Union[int, list, slice], array2set: np.ndarray):
+    def __setitem__(self, idx: Union[int, list, slice], array2set: Union[np.ndarray, Number]):
         """Overwrite the pixel values of GeoArray.arr with the given array.
 
         :param idx:         the index position to overwrite
@@ -1417,6 +1418,7 @@ class GeoArray(object):
                  pmin: float = 2,
                  pmax: float = 98,
                  cmap: Union[str, 'Colormap'] = None,
+                 draw_gridlines: bool = True,
                  nodataVal: float = None,
                  res_factor: float = None,
                  return_map: bool = False
@@ -1436,6 +1438,7 @@ class GeoArray(object):
         :param pmin:            percentage to be used for excluding the darkest pixels from stretching (default: 2)
         :param pmax:            percentage to be used for excluding the brightest pixels from stretching (default: 98)
         :param cmap:
+        :param draw_gridlines:  whether to draw gridlines into the map (default: True)
         :param nodataVal:
         :param res_factor:      <float> resolution factor for downsampling of the image to be plotted in order to save
                                 plotting time and memory (default=None -> downsampling is performed to 1000x1000)
@@ -1493,8 +1496,9 @@ class GeoArray(object):
                   extent=list(gA2plot.box.boundsMap)
                   )
 
-        # show grid lines
-        ax.gridlines(draw_labels=True, linewidth=2, color='gray', alpha=0.5, linestyle='--')  # cartopy>=0.18.0 only
+        # draw grid lines
+        if draw_gridlines:
+            ax.gridlines(draw_labels=True, linewidth=2, color='gray', alpha=0.5, linestyle='--')  # cartopy>=0.18.0 only
 
         if return_map:
             return fig, ax
@@ -1811,7 +1815,7 @@ class GeoArray(object):
                    return_GeoArray: bool = True,
                    reset_bandnames: bool = False
                    ) -> Union['GeoArray', Tuple[np.ndarray, tuple, str]]:
-        """Return a new GeoArray instance representing a subset of the initial one wit respect to given array position.
+        """Return a new GeoArray instance representing a subset of the initial one with respect to given array position.
 
         :param xslice:          a slice providing the X-position for the subset in the form slice(xstart, xend, xstep)
         :param yslice:          a slice providing the Y-position for the subset in the form slice(ystart, yend, ystep)
@@ -1901,7 +1905,7 @@ class GeoArray(object):
 
     def reproject_to_new_grid(self,
                               prototype: 'GeoArray' = None,
-                              tgt_prj: str = None,
+                              tgt_prj: Union[str, int] = None,
                               tgt_xygrid: Sequence = None,
                               rspAlg: Union[str, int] = 'cubic',
                               CPUs: int = None
@@ -1909,7 +1913,7 @@ class GeoArray(object):
         """Reproject all array-like attributes to a given target grid.
 
         :param prototype:   an instance of GeoArray to be used as pixel grid reference
-        :param tgt_prj:     WKT string of the projection
+        :param tgt_prj:     GDAL projection as WKT string or EPSG code ('epsg:1234' or <EPSG_int>)
         :param tgt_xygrid:  target XY grid, e.g. [[xmin,xmax], [ymax, ymin]] for the UL corner
         :param rspAlg:      GDAL compatible resampling algorithm code
         :param CPUs:        number of CPUs to use (default: None -> use all available CPUs)

{geoarray-0.17.0 → geoarray-0.17.1}/geoarray/version.py

@@ -22,5 +22,5 @@
 # limitations under the License.
 
 
-__version__ = '0.17.0'
-__versionalias__ = '20230615.01'
+__version__ = '0.17.1'
+__versionalias__ = '20231103.01'

{geoarray-0.17.0 → geoarray-0.17.1/geoarray.egg-info}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: geoarray
-Version: 0.17.0
+Version: 0.17.1
 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
 Keywords: geoarray,geoprocessing,gdal,numpy
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -17,13 +16,65 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
-Provides-Extra: interactive_plotting
+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: matplotlib
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: py_tools_ds>=0.19.0
+Requires-Dist: scikit-image
+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"
 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>=2.1.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"
+Requires-Dist: urlchecker; extra == "test"
+Requires-Dist: parameterized; extra == "test"
 Provides-Extra: lint
+Requires-Dist: flake8; extra == "lint"
+Requires-Dist: pycodestyle; extra == "lint"
+Requires-Dist: pydocstyle; extra == "lint"
 Provides-Extra: dev
-License-File: LICENSE
-License-File: AUTHORS.rst
+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: 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"
 
 ========
 geoarray
@@ -143,5 +194,3 @@ This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypack
 .. _here: https://git.gfz-potsdam.de/danschef/geoarray/-/blob/main/examples/notebooks/features_and_usage.ipynb
 .. _pip: https://pip.pypa.io
 .. _Python installation guide: http://docs.python-guide.org/en/latest/starting/installation/
-
-

{geoarray-0.17.0 → geoarray-0.17.1}/setup.py

@@ -70,6 +70,7 @@ setup(
     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',