Merge remote-tracking branch 'upstream/main' into regr-equal-z

.github/workflows/release.yml

@@ -113,7 +113,7 @@ jobs:
         if: ${{ matrix.msvc_arch }}
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.14.0
+        uses: pypa/cibuildwheel@v2.14.1
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_SKIP: cp36-* pp* *musllinux* cp310-manylinux_i686

CHANGES.txt

@@ -11,13 +11,15 @@ Improvements:
   to allow, skip, or error on nonfinite (NaN / Inf) coordinates. The default
   behaviour (allow) is backwards compatible (#1594).
 
-Version 2.0.2 (unreleased)
---------------------------
+2.0.2 (unreleased)
+------------------
 
 Bug fixes:
 
 - Fix regression in the (in)equality comparison (``geom1 == geom2``) using ``__eq__`` to
   not ignore the z-coordinates (#1732).
+- Fix ``MultiPolygon()`` constructor to accept polygons without holes (#1850).
+
 
 2.0.1 (2023-01-30)
 ------------------

docs/release/2.x.rst

@@ -22,6 +22,8 @@ Bug fixes:
 
 - Fix regression in the (in)equality comparison (``geom1 == geom2``) using ``__eq__`` to
   not ignore the z-coordinates (#1732).
+- Fix ``MultiPolygon()`` constructor to accept polygons without holes (#1850).
+
 
 .. _version-2-0-1:
 

shapely/geometry/multipolygon.py

@@ -77,7 +77,10 @@ def __new__(self, polygons=None):
             ob = polygons[i]
             if not isinstance(ob, polygon.Polygon):
                 shell = ob[0]
-                holes = ob[1]
+                if len(ob) > 1:
+                    holes = ob[1]
+                else:
+                    holes = None
                 p = polygon.Polygon(shell, holes)
             else:
                 p = polygon.Polygon(ob)

shapely/tests/geometry/test_multipolygon.py

@@ -8,7 +8,6 @@
 
 class TestMultiPolygon(MultiGeometryTestCase):
     def test_multipolygon(self):
-
         # From coordinate tuples
         coords = [
             (
@@ -30,6 +29,21 @@ def test_multipolygon(self):
             ]
         ]
 
+        # Or without holes
+        coords2 = [(((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0)),)]
+        geom = MultiPolygon(coords2)
+        assert isinstance(geom, MultiPolygon)
+        assert len(geom.geoms) == 1
+        assert dump_coords(geom) == [
+            [
+                (0.0, 0.0),
+                (0.0, 1.0),
+                (1.0, 1.0),
+                (1.0, 0.0),
+                (0.0, 0.0),
+            ]
+        ]
+
         # Or from polygons
         p = Polygon(
             ((0, 0), (0, 1), (1, 1), (1, 0)),