[arch-commits] Commit in python-shapely/trunk (PKGBUILD geos-3.9.patch)

[Evangelos Foutras]

    Date: Wednesday, December 8, 2021 @ 06:00:10
  Author: foutrelis
Revision: 1065623

Add fix for geos 3.9

Added:
  python-shapely/trunk/geos-3.9.patch
Modified:
  python-shapely/trunk/PKGBUILD

----------------+
 PKGBUILD       |   12 ++++++++----
 geos-3.9.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-08 05:53:55 UTC (rev 1065622)
+++ PKGBUILD	2021-12-08 06:00:10 UTC (rev 1065623)
@@ -13,12 +13,16 @@
 optdepends=('python-numpy: for shapely.vectorized submodule')
 makedepends=('python-setuptools' 'python-packaging' 'python-numpy' 'cython')
 checkdepends=('python-pytest')
-source=("https://pypi.io/packages/source/S/Shapely/Shapely-${pkgver}.tar.gz")
-sha512sums=('f5991a35692241ff48f7219edd88bdab7da5b9135c22d26ca530cbdb9160717fd88f2913a9da8ae53869c68955418c14ffd5d798df196639de63660226bd6412')
+source=("https://pypi.io/packages/source/S/Shapely/Shapely-${pkgver}.tar.gz"
+        geos-3.9.patch)
+sha512sums=('f5991a35692241ff48f7219edd88bdab7da5b9135c22d26ca530cbdb9160717fd88f2913a9da8ae53869c68955418c14ffd5d798df196639de63660226bd6412'
+            '9cc2e1a8b1272451ccfde2af287cb4dc31811b67c02c3d94f235c039f99173dcd8e128a0a7c57a8c098b45290e4acc9d957914c6719c1c7076bb62ff2aac837d')
 
 prepare() {
-  rm -r Shapely-$pkgver/_vendor
-  sed -i 's/from _vendor.packaging./from packaging./' Shapely-$pkgver/setup.py
+  cd Shapely-$pkgver
+  patch -Np1 -i ../geos-3.9.patch
+  rm -r _vendor
+  sed -i 's/from _vendor.packaging./from packaging./' setup.py
 }
 
 build() {

Added: geos-3.9.patch
===================================================================
--- geos-3.9.patch	                        (rev 0)
+++ geos-3.9.patch	2021-12-08 06:00:10 UTC (rev 1065623)
@@ -0,0 +1,30 @@
+From 611a0b3b2047bf8a49db32dc4b30684a10f5b6eb Mon Sep 17 00:00:00 2001
+From: Mike Taves <mwtoews at gmail.com>
+Date: Mon, 14 Dec 2020 12:06:36 +1300
+Subject: [PATCH] Expand CI and tests to support GEOS 3.9.0beta2 (#1042)
+
+* Expand CI and tests to support GEOS 3.9.0beta2
+
+* Change build/install scripts to be CI agnostic
+
+* disable AppVeyor's ctest fail due to GEOS issue with simplify on MSVC
+
+* find_library() for Linux should use 'libgeos_c'
+---
+ tests/test_svg.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_svg.py b/tests/test_svg.py
+index fcc2679..dac3e71 100644
+--- a/tests/test_svg.py
++++ b/tests/test_svg.py
+@@ -174,7 +174,8 @@ class SvgTestCase(unittest.TestCase):
+         self.assertSVG(GeometryCollection(), '<g />')
+         # Valid
+         self.assertSVG(
+-            Point(7, 3).union(LineString([(4, 2), (8, 4)])),
++            GeometryCollection(
++                [Point(7, 3), LineString([(4, 2), (8, 4)])]),
+             '<g><circle cx="7.0" cy="3.0" r="3.0" stroke="#555555" '
+             'stroke-width="1.0" fill="#66cc99" opacity="0.6" />'
+             '<polyline fill="none" stroke="#66cc99" stroke-width="2.0" '