diff --git a/.gitignore b/.gitignore index a5f7286..e083238 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /shapely-1.8.1.tar.gz /shapely-1.8.1.post1.tar.gz /shapely-1.8.2.tar.gz +/shapely-1.8.4.tar.gz diff --git a/ef380ba8796702a56e05138ed8599e89f617d2c9.patch b/ef380ba8796702a56e05138ed8599e89f617d2c9.patch deleted file mode 100644 index 9beb863..0000000 --- a/ef380ba8796702a56e05138ed8599e89f617d2c9.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 7dbbe55c..661291a5 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.spec b/python-shapely.spec index 9423110..a5b2c43 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -5,7 +5,7 @@ %bcond_without doc_pdf Name: python-shapely -Version: 1.8.2 +Version: 1.8.4 Release: %autorelease Summary: Manipulation and analysis of geometric objects in the Cartesian plane @@ -13,15 +13,6 @@ License: BSD-3-Clause URL: https://github.com/shapely/shapely Source0: %{url}/archive/%{version}/shapely-%{version}.tar.gz -# update parallel offset test for GEOS 3.11 -# https://github.com/shapely/shapely/commit/ef380ba8796702a56e05138ed8599e89f617d2c9 -# -# Works around: -# -# Shapely relying on inconsistent GEOS behavior? (Using geos 3.11.0) -# https://github.com/shapely/shapely/issues/1436 -Patch: %{url}/commit/ef380ba8796702a56e05138ed8599e89f617d2c9.patch - BuildRequires: gcc BuildRequires: geos-devel diff --git a/sources b/sources index 6d0c1c2..e9e17a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shapely-1.8.2.tar.gz) = c85323f180622235257aed28c85640c63bb43cbcb2bd7ed9b354a0f23a92e0ca8becf7a94e85edea3a90cfd01017ddfc6f268f4bb2945639c2cae29a73292bd6 +SHA512 (shapely-1.8.4.tar.gz) = 8b57a2e83f8eb10a041f6a8d9170b84ed708a5835a16874761e5ccec0453ff34a282aeefb0367ab79c85216a68f5bb8b4b75503e81eaa3f7277f4036b8b0b242