diff --git a/Shapely-fix-svg-collection-pr1042.patch b/Shapely-fix-svg-collection-pr1042.patch new file mode 100644 index 0000000..de7068c --- /dev/null +++ b/Shapely-fix-svg-collection-pr1042.patch @@ -0,0 +1,27 @@ +From 77879a954d24d1596f986d16ba3eff5e13861164 Mon Sep 17 00:00:00 2001 +From: Mike Taves +Date: Thu, 3 Dec 2020 17:14:34 +1300 +Subject: [PATCH] Expand CI and tests to support GEOS 3.9.0beta2 + +--- + .travis.yml | 6 ++--- + appveyor.yml | 2 +- + ...test_create_inconsistent_dimensionality.py | 10 +++++++- + tests/test_svg.py | 3 ++- + tests/test_wkb.py | 25 ++++++++++++++++++- + 5 files changed, 39 insertions(+), 7 deletions(-) + +diff --git a/tests/test_svg.py b/tests/test_svg.py +index fcc2679d..dac3e71f 100644 +--- a/tests/test_svg.py ++++ b/tests/test_svg.py +@@ -174,7 +174,8 @@ def test_collection(self): + self.assertSVG(GeometryCollection(), '') + # Valid + self.assertSVG( +- Point(7, 3).union(LineString([(4, 2), (8, 4)])), ++ GeometryCollection( ++ [Point(7, 3), LineString([(4, 2), (8, 4)])]), + '' + ' + +- Add Shapely-fix-svg-collection-pr1042.patch + gh#Toblerity/Shapely#1042 to fix failing test due to newer + matplotlib version (and GEOS?) + ------------------------------------------------------------------- Sun Jan 3 18:57:57 UTC 2021 - Benjamin Greiner diff --git a/python-Shapely.spec b/python-Shapely.spec index 2e6a376..5b86b5f 100644 --- a/python-Shapely.spec +++ b/python-Shapely.spec @@ -1,7 +1,7 @@ # # spec file for package python-Shapely # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,8 @@ Summary: Geospatial geometries, predicates, and operations License: BSD-3-Clause URL: https://github.com/Toblerity/Shapely Source: https://files.pythonhosted.org/packages/source/S/Shapely/Shapely-%{version}.tar.gz +# PATCH-FIX-UPSTREAM Shapely-fix-svg-collection-pr1042.patch -- from gh#Toblerity/Shapely#1042 fix svg test +Patch0: Shapely-fix-svg-collection-pr1042.patch BuildRequires: %{python_module Cython >= 0.19} BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel} @@ -55,7 +57,7 @@ but can be readily integrated with packages that are like WorldMill and pyproj. %prep -%setup -q -n Shapely-%{version} +%autosetup -p1 -n Shapely-%{version} %build CFLAGS="%{optflags} `geos-config --cflags` LDFLAGS=`geos-config --clibs`"