[Git][debian-gis-team/python-cartopy][master] 4 commits: New upstream version 0.21.1+dfsg
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue Dec 13 08:36:45 GMT 2022
Bas Couwenberg pushed to branch master at Debian GIS Project / python-cartopy
Commits:
6565a9eb by Bas Couwenberg at 2022-12-13T09:15:44+01:00
New upstream version 0.21.1+dfsg
- - - - -
afea719b by Bas Couwenberg at 2022-12-13T09:15:55+01:00
Update upstream source from tag 'upstream/0.21.1+dfsg'
Update to upstream version '0.21.1+dfsg'
with Debian dir 6ae89526fc6ac7140b07d708ca3b04ae151e39a5
- - - - -
8ef98784 by Bas Couwenberg at 2022-12-13T09:16:27+01:00
New upstream release.
- - - - -
6ee83d2d by Bas Couwenberg at 2022-12-13T09:19:07+01:00
Set distribution to unstable.
- - - - -
10 changed files:
- .circleci/config.yml
- .github/workflows/ci-testing.yml
- .github/workflows/release.yml
- INSTALL
- debian/changelog
- environment.yml
- lib/cartopy/feature/__init__.py
- lib/cartopy/mpl/patch.py
- lib/cartopy/trace.pyx
- requirements/default.txt
Changes:
=====================================
.circleci/config.yml
=====================================
@@ -45,7 +45,7 @@ deps-run: &deps-install
pyshp \
scipy \
setuptools_scm \
- 'shapely<2' \
+ shapely \
$EXTRA_PACKAGES \
--file docs/doc-requirements.txt
conda list -n test-environment
=====================================
.github/workflows/ci-testing.yml
=====================================
@@ -12,6 +12,11 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.8, 3.9, '3.10']
+ shapely-dev: [false]
+ include:
+ - os: ubuntu-latest
+ python-version: '3.10'
+ shapely-dev: true
defaults:
run:
shell: bash -l {0}
@@ -33,9 +38,14 @@ jobs:
echo "PACKAGES=cython=0.29.15 matplotlib-base=3.2.1 numpy=1.19 owslib=0.19.1 pyproj=3.0 scipy=1.4.0 shapely=1.6.4" >> $GITHUB_ENV
- name: Latest packages
- if: steps.minimum-packages.conclusion == 'skipped'
+ if: steps.minimum-packages.conclusion == 'skipped' && !matrix.shapely-dev
run: |
- echo "PACKAGES=cython fiona matplotlib-base numpy pyproj pykdtree scipy shapely<2" >> $GITHUB_ENV
+ echo "PACKAGES=cython fiona matplotlib-base numpy pyproj pykdtree scipy shapely" >> $GITHUB_ENV
+
+ - name: Latest packages with Shapely dev
+ if: steps.minimum-packages.conclusion == 'skipped' && matrix.shapely-dev
+ run: |
+ echo "PACKAGES=cython fiona matplotlib-base numpy pyproj pykdtree scipy geos" >> $GITHUB_ENV
- name: Coverage packages
id: coverage
@@ -49,11 +59,16 @@ jobs:
- name: Install dependencies
run: |
PACKAGES="$PACKAGES owslib pep8 pillow pyshp pytest pytest-mpl!=0.16.0"
- PACKAGES="$PACKAGES pytest-xdist setuptools_scm shapely<2"
+ PACKAGES="$PACKAGES pytest-xdist setuptools_scm"
conda install $PACKAGES
conda info -a
conda list
+ - name: Install Shapely dev
+ if: matrix.shapely-dev
+ run: |
+ python -m pip install git+https://github.com/shapely/shapely.git@main
+
- name: Install Cartopy
id: install
run: |
=====================================
.github/workflows/release.yml
=====================================
@@ -26,7 +26,7 @@ jobs:
run: |
PACKAGES="cython fiona matplotlib-base numpy pyproj pykdtree scipy"
PACKAGES="$PACKAGES owslib pep8 pillow pyshp pytest"
- PACKAGES="$PACKAGES pytest-xdist setuptools_scm shapely<2"
+ PACKAGES="$PACKAGES pytest-xdist setuptools_scm shapely"
conda install $PACKAGES
- name: Create sdist
=====================================
INSTALL
=====================================
@@ -85,7 +85,7 @@ For macOS, the required dependencies can be installed in the following way::
pip3 install --upgrade pyshp
# shapely needs to be built from source to link to geos. If it is already
# installed, uninstall it by: pip3 uninstall shapely
- pip3 install "shapely<2" --no-binary shapely
+ pip3 install shapely --no-binary shapely
Still on macOS, make sure you have installed pkg-config and set the
`PKG_CONFIG_PATH` environment variable as follows::
@@ -117,7 +117,7 @@ Further information about the required dependencies can be found here:
GEOS is an API of spatial predicates and functions for processing geometry
written in C++.
-**Shapely** between 1.6.4 and 1.8.4 (https://github.com/Toblerity/Shapely)
+**Shapely** 1.6.4 or later (https://github.com/Toblerity/Shapely)
Python package for the manipulation and analysis of planar geometric
objects.
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+python-cartopy (0.21.1+dfsg-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 13 Dec 2022 09:18:35 +0100
+
python-cartopy (0.21.0+dfsg-4) unstable; urgency=medium
* Team upload.
=====================================
environment.yml
=====================================
@@ -4,13 +4,13 @@
# conda activate cartopy-dev
# pip install -e .
#
-name: cartopy-dev2
+name: cartopy-dev
channels:
- conda-forge
dependencies:
- cython>=0.28.5
- numpy>=1.18
- - shapely>=1.6.4,<2
+ - shapely>=1.6.4
- geos>=3.7.2
- pyshp>=2.1
- pyproj>=3.0.0
=====================================
lib/cartopy/feature/__init__.py
=====================================
@@ -100,7 +100,9 @@ class Feature(metaclass=ABCMeta):
geometries for this dataset.
"""
- if extent is not None:
+ # shapely 2.0 returns tuple of NaNs instead of None for empty geometry
+ # -> check for both
+ if extent is not None and not np.isnan(extent[0]):
extent_geom = sgeom.box(extent[0], extent[2],
extent[1], extent[3])
return (geom for geom in self.geometries() if
=====================================
lib/cartopy/mpl/patch.py
=====================================
@@ -208,7 +208,7 @@ def path_to_geos(path, force_ccw=False):
# Remove any zero area Polygons
def not_zero_poly(geom):
- return ((isinstance(geom, sgeom.Polygon) and not geom._is_empty and
+ return ((isinstance(geom, sgeom.Polygon) and not geom.is_empty and
geom.area != 0) or
not isinstance(geom, sgeom.Polygon))
=====================================
lib/cartopy/trace.pyx
=====================================
@@ -31,6 +31,7 @@ cdef extern from "geos_c.h":
pass
ctypedef struct GEOSCoordSequence
ctypedef struct GEOSPreparedGeometry
+ GEOSContextHandle_t GEOS_init_r() nogil
GEOSCoordSequence *GEOSCoordSeq_create_r(GEOSContextHandle_t, unsigned int, unsigned int) nogil
GEOSGeometry *GEOSGeom_createPoint_r(GEOSContextHandle_t, GEOSCoordSequence *) nogil
GEOSGeometry *GEOSGeom_createLineString_r(GEOSContextHandle_t, GEOSCoordSequence *) nogil
@@ -53,14 +54,13 @@ import re
import warnings
import shapely.geometry as sgeom
-from shapely.geos import lgeos
from pyproj import Geod, Transformer
from pyproj.exceptions import ProjError
cdef GEOSContextHandle_t get_geos_context_handle():
- cdef ptr handle = lgeos.geos_handle
- return <GEOSContextHandle_t>handle
+ cdef GEOSContextHandle_t handle = GEOS_init_r()
+ return handle
cdef GEOSGeometry *geos_from_shapely(shapely_geom) except *:
=====================================
requirements/default.txt
=====================================
@@ -1,5 +1,5 @@
numpy>=1.18
matplotlib>=3.1
-shapely>=1.6.4,<2
+shapely>=1.6.4
pyshp>=2.1
pyproj>=3.0.0
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/-/compare/66b08d789fdb284a8d85a8fcee2185891780150a...6ee83d2dacd78f9eea312ea7cce78e329b65756a
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/-/compare/66b08d789fdb284a8d85a8fcee2185891780150a...6ee83d2dacd78f9eea312ea7cce78e329b65756a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20221213/4042ba14/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list