[Git][debian-gis-team/mapproxy][master] Add upstream patch to fix Shapely 2.0 support. (closes: #1025610)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / mapproxy


Commits:
e16f271f by Bas Couwenberg at 2023-10-25T09:16:34+02:00
Add upstream patch to fix Shapely 2.0 support. (closes: #1025610)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/pr749-shapely.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -7,6 +7,8 @@ mapproxy (1.16.0+dfsg-2) UNRELEASED; urgency=medium
   * Use execute_{before,after} instead of override in rules file.
   * Enable Salsa CI.
   * Switch to dh-sequence-*.
+  * Add upstream patch to fix Shapely 2.0 support.
+    (closes: #1025610)
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 12 Jun 2023 14:54:04 +0200
 


=====================================
debian/patches/pr749-shapely.patch
=====================================
@@ -0,0 +1,55 @@
+Description: Bump to testing Shapely 2.0.1
+Author: Ben Greiner <code at bnavigator.de>
+Origin: https://github.com/mapproxy/mapproxy/pull/749
+Bug: https://github.com/mapproxy/mapproxy/issues/611
+
+--- a/doc/install.rst
++++ b/doc/install.rst
+@@ -90,7 +90,7 @@ MapProxy uses YAML for the configuration
+ 
+ Shapely and GEOS *(optional)*
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-You will need Shapely to use the :doc:`coverage feature <coverages>` of MapProxy. Shapely offers Python bindings for the GEOS library. You need Shapely (``python-shapely``) and GEOS (``libgeos-dev``). You can install Shapely as a Python package with ``pip install Shapely`` if you system does not provide a recent (>= 1.2.0) version of Shapely.
++You will need Shapely to use the :doc:`coverage feature <coverages>` of MapProxy. Shapely offers Python bindings for the GEOS library. You need Shapely (``python-shapely``) and GEOS (``libgeos-dev``). You can install Shapely as a Python package with ``pip install Shapely`` if you system does not provide a recent (>= 1.8) version of Shapely.
+ 
+ GDAL *(optional)*
+ ~~~~~~~~~~~~~~~~~
+--- a/mapproxy/test/unit/test_geom.py
++++ b/mapproxy/test/unit/test_geom.py
+@@ -22,11 +22,7 @@ import shutil
+ import pytest
+ import shapely
+ import shapely.prepared
+-try:
+-    # shapely >=1.6
+-    from shapely.errors import ReadingError
+-except ImportError:
+-    from shapely.geos import ReadingError
++from shapely.errors import ReadingError
+ 
+ from mapproxy.srs import SRS, bbox_equals
+ from mapproxy.util.geom import (
+--- a/mapproxy/util/geom.py
++++ b/mapproxy/util/geom.py
+@@ -32,11 +32,7 @@ try:
+     import shapely.geometry
+     import shapely.ops
+     import shapely.prepared
+-    try:
+-        # shapely >=1.6
+-        from shapely.errors import ReadingError
+-    except ImportError:
+-        from shapely.geos import ReadingError
++    from shapely.errors import ReadingError
+     geom_support = True
+ except ImportError:
+     geom_support = False
+@@ -234,7 +230,7 @@ def transform_polygon(transf, polygon):
+ 
+ def transform_multipolygon(transf, multipolygon):
+     transformed_polygons = []
+-    for polygon in multipolygon:
++    for polygon in multipolygon.geoms:
+         transformed_polygons.append(transform_polygon(transf, polygon))
+     return shapely.geometry.MultiPolygon(transformed_polygons)
+ 


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ disable-tag_date.patch
 reproducible-build.patch
 mapnik.patch
 javascript.patch
+pr749-shapely.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/commit/e16f271f44caec5dc76dffa4b677715d57fcd491

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/commit/e16f271f44caec5dc76dffa4b677715d57fcd491
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/20231025/ac4ac61d/attachment-0001.htm>