diff --git a/Shapely-1.8.2.tar.gz b/Shapely-1.8.2.tar.gz deleted file mode 100644 index 6a0b398..0000000 --- a/Shapely-1.8.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:572af9d5006fd5e3213e37ee548912b0341fb26724d6dc8a4e3950c10197ebb6 -size 198810 diff --git a/Shapely-1.8.4.tar.gz b/Shapely-1.8.4.tar.gz new file mode 100644 index 0000000..4ad3bc1 --- /dev/null +++ b/Shapely-1.8.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a195e51caafa218291f2cbaa3fef69fd3353c93ec4b65b2a4722c4cf40c3198c +size 199920 diff --git a/Shapely-issue1436-ef380ba-geos311.patch b/Shapely-issue1436-ef380ba-geos311.patch deleted file mode 100644 index 2c0768f..0000000 --- a/Shapely-issue1436-ef380ba-geos311.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ef380ba8796702a56e05138ed8599e89f617d2c9 Mon Sep 17 00:00:00 2001 -From: Joris Van den Bossche -Date: Sun, 10 Jul 2022 11:14:30 +0200 -Subject: [PATCH] update parallel offset test for GEOS 3.11 - ---- - tests/test_parallel_offset.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tests/test_parallel_offset.py b/tests/test_parallel_offset.py -index 7dbbe55cd..661291a55 100644 ---- a/tests/test_parallel_offset.py -+++ b/tests/test_parallel_offset.py -@@ -9,9 +9,11 @@ def test_parallel_offset_linestring(self): - left = line1.parallel_offset(5, 'left') - self.assertEqual(left, LineString([(0, 5), (10, 5)])) - right = line1.parallel_offset(5, 'right') -- self.assertEqual(right, LineString([(10, -5), (0, -5)])) -+ # using spatial equality because the order of coordinates is not guaranteed -+ # (GEOS 3.11 changed this, see https://github.com/shapely/shapely/issues/1436) -+ assert right.equals(LineString([(10, -5), (0, -5)])) - right = line1.parallel_offset(-5, 'left') -- self.assertEqual(right, LineString([(10, -5), (0, -5)])) -+ assert right.equals(LineString([(10, -5), (0, -5)])) - left = line1.parallel_offset(-5, 'right') - self.assertEqual(left, LineString([(0, 5), (10, 5)])) - diff --git a/python-Shapely.changes b/python-Shapely.changes index fea4ab2..5a96b63 100644 --- a/python-Shapely.changes +++ b/python-Shapely.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sat Oct 1 21:19:48 UTC 2022 - andy great + +- Update to version 1.8.4. + * The new c_geom_p type caused a regression and has been removed + (#1487). +- Update for version 1.8.3. + * Deprecations: + * The STRtree class will be changed in 2.0.0 and will not be + compatible with the class in versions 1.8.x. This change + obsoletes the deprecation announcement in 1.8a3 (below). + * Bug fixes: + * The signature for GEOSMinimumClearance has been corrected, + fixing an issue affecting aarch64-darwin (#1480) + * Return and arg types have been corrected and made more strict + for area, length, and distance properties. + * A new c_geom_p type has been created to replace c_void_p when + calling GEOS functions (#1479). + * An incorrect polygon-line intersection (#1427) has been fixed + in GEOS 3.10.3,mwhich will be included in wheels published + to PyPI. + * GEOS buffer parameters are now destroyed, fixing a memory + leak (#1440). +- Remove patch, fix upstream. + Shapely-issue1436-ef380ba-geos311.patch + ------------------------------------------------------------------- Tue Jul 19 20:10:00 UTC 2022 - Ben Greiner diff --git a/python-Shapely.spec b/python-Shapely.spec index b259e1b..8cc091c 100644 --- a/python-Shapely.spec +++ b/python-Shapely.spec @@ -20,14 +20,12 @@ %bcond_without test %define skip_python2 1 Name: python-Shapely -Version: 1.8.2 +Version: 1.8.4 Release: 0 Summary: Geospatial geometries, predicates, and operations License: BSD-3-Clause URL: https://github.com/shapely/shapely Source: https://files.pythonhosted.org/packages/source/S/Shapely/Shapely-%{version}.tar.gz -# PATCH-FIX-UPSTREAM Shapely-issue1436-ef380ba-geos311.patch gh#shapely/shapely#1436 -- work around issue with geos 3.11.0 -Patch1: Shapely-issue1436-ef380ba-geos311.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel >= 3.6} BuildRequires: %{python_module numpy-devel}