geoarray 0.16.1__tar.gz → 0.17.1__tar.gz

{geoarray-0.16.1 → 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.16.1 → geoarray-0.17.1}/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 2.6, 2.7, 3.3, 3.4, 3.5 and 3.6, and for PyPy. Check
+3. The pull request should work for Python 3.8, 3.9, 3.10, and 3.11. Check
    https://travis-ci.org/danschef/geoarray/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

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

@@ -2,6 +2,24 @@
 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)
+-------------------
+
+* !38: Removed GeoArray.arg attribute as it is not needed and just consumes memory.
+* !39: Revised the project to consistently use new-style type hints.
+* !40: Added workaround for missing PROJ_DATA environment variable.
+* !41: Revised GeoArray.show to be compatible with new versions of holoviews.
+* !42: Dropped support for cartopy<0.20 and removed pyepsg requirement as cartopy>=0.20 uses pyproj instead.
+* !43: Dropped support for Python 3.7 and added support for Python 3.11.
+
+
 0.16.1 (16.02.2023)
 -------------------
 
@@ -356,7 +374,7 @@ History
 ------------------
 
 * Fixed missing comma.
-* Added cartopy setup o test_geoarray to make CI work.
+* Added cartopy setup to test_geoarray to make CI work.
 * Revised GeoArray.show_map() and replaced basemap by cartopy. Dropped mpld3 requirement. Fixed issue #28.
 * Added GeoArray._get_cmap_vmin_vmax() and moved code from .show(), .show_map() and .show_map_utm() there.
 

{geoarray-0.16.1 → 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.16.1/geoarray.egg-info → geoarray-0.17.1}/PKG-INFO

@@ -1,29 +1,80 @@
 Metadata-Version: 2.1
 Name: geoarray
-Version: 0.16.1
+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
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >3.7
-Provides-Extra: interactive_plotting
+Classifier: Programming Language :: Python :: 3.11
+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: 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
@@ -103,7 +154,7 @@ There is also a `pip`_ installer for geoarray. However, please note that geoarra
 open source packages that may cause problems when installed with pip. Therefore, we strongly recommend
 to resolve the following dependencies before the pip installer is run:
 
-    * cartopy
+    * cartopy >=0.20
     * gdal >=2.1.0
     * geopandas
     * holoviews  # optional, in case you want to use interactive plotting
@@ -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.16.1 → geoarray-0.17.1}/README.rst

@@ -76,7 +76,7 @@ There is also a `pip`_ installer for geoarray. However, please note that geoarra
 open source packages that may cause problems when installed with pip. Therefore, we strongly recommend
 to resolve the following dependencies before the pip installer is run:
 
-    * cartopy
+    * cartopy >=0.20
     * gdal >=2.1.0
     * geopandas
     * holoviews  # optional, in case you want to use interactive plotting

{geoarray-0.16.1 → geoarray-0.17.1}/geoarray/__init__.py

@@ -46,3 +46,9 @@ __all__ = ['__version__',
            'NoDataMask',
            'CloudMask'
            ]
+
+# $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
+if 'GDAL_DATA' in os.environ and 'PROJ_DATA' not in os.environ and 'PROJ_LIB' not in os.environ:
+    os.environ['PROJ_DATA'] = os.path.join(os.path.dirname(os.environ['GDAL_DATA']), 'proj')