Hi, ports@:
Here is a patch for geo/py-shapely to update to 1.7.0.
It build well and pass all tests on amd64-current system.
Only one port depends on geo/py-shapely: geo/mapproxy.
It build well and pass all tests if we patch mapproxy to run
with python3.8. I submitted the patch for mapproxy just now.
Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/geo/py-shapely/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile3 Jul 2020 21:12:54 - 1.12
+++ Makefile9 Jul 2020 13:02:02 -
@@ -2,12 +2,11 @@
COMMENT = manipulation and analysis of planar geometric objects
-MODPY_EGG_VERSION =1.6.4
+MODPY_EGG_VERSION =1.7.0
GH_TAGNAME = ${MODPY_EGG_VERSION}
GH_ACCOUNT = Toblerity
GH_PROJECT = Shapely
DISTNAME = py-shapely-${MODPY_EGG_VERSION}
-REVISION = 3
CATEGORIES = geo
Index: distinfo
===
RCS file: /cvs/ports/geo/py-shapely/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo11 Feb 2018 10:48:31 - 1.3
+++ distinfo9 Jul 2020 13:02:02 -
@@ -1,2 +1,2 @@
-SHA256 (py-shapely-1.6.4.tar.gz) = NZodbwVptywswSjpCC+1AT8CasL5pm8IF8NJwvly+O4=
-SIZE (py-shapely-1.6.4.tar.gz) = 268989
+SHA256 (py-shapely-1.7.0.tar.gz) = D0KD1VkVeDQONvZJc2tJbSWnk6RbmiyTsSjSqFbyCJs=
+SIZE (py-shapely-1.7.0.tar.gz) = 281419
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/geo/py-shapely/patches/patch-setup_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-setup_py
--- patches/patch-setup_py 27 Nov 2018 18:03:37 - 1.4
+++ patches/patch-setup_py 9 Jul 2020 13:02:02 -
@@ -1,14 +1,14 @@
-$OpenBSD: patch-setup_py,v 1.4 2018/11/27 18:03:37 landry Exp $
+$OpenBSD$
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -324,7 +324,7 @@ if os.path.exists("MANIFEST.in"):
- if (force_cython or not os.path.exists(c_file)
- or os.path.getmtime(pyx_file) > os.path.getmtime(c_file)):
- log.info("Updating C extension with Cython.")
--subprocess.check_call(["cython",
"shapely/speedups/_speedups.pyx"])
-+subprocess.check_call(["cython${MODPY_BIN_SUFFIX}",
"shapely/speedups/_speedups.pyx"])
- except (subprocess.CalledProcessError, OSError):
- log.warn("Could not (re)create C extension with Cython.")
- if force_cython:
+@@ -365,7 +365,7 @@ except ImportError:
+ try:
+ if force_cython:
+ log.info("Updating C extension with Cython.")
+-subprocess.check_call(["cython", "shapely/speedups/_speedups.pyx"])
++subprocess.check_call(["cython${MODPY_BIN_SUFFIX}",
"shapely/speedups/_speedups.pyx"])
+ except (subprocess.CalledProcessError, OSError):
+ log.warning("Could not (re)create C extension with Cython.")
+ if force_cython:
Index: pkg/PLIST
===
RCS file: /cvs/ports/geo/py-shapely/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 25 Feb 2020 10:06:26 - 1.4
+++ pkg/PLIST 9 Jul 2020 13:02:02 -
@@ -16,7 +16,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}coords.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}ctypes_declarations.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}ftools.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}geos.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}impl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}iterops.${MODPY_PYC_MAGIC_TAG}pyc
@@ -53,7 +52,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/shapely/examples/dissolve.py
lib/python${MODPY_VERSION}/site-packages/shapely/examples/geoms.py
lib/python${MODPY_VERSION}/site-packages/shapely/examples/intersect.py
-lib/python${MODPY_VERSION}/site-packages/shapely/ftools.py
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}/
@@ -91,7 +89,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/shapely/speedups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/speedups/_speedups.c
lib/python${MODPY_VERSION}/site-packages/
