geo/py-shapely: update to 1.8.4, switch to MODPY_PEP517=setuptools

This commit is contained in:
landry 2022-09-11 10:20:49 +00:00
parent 7975a840f8
commit 932c5b85e9
3 changed files with 50 additions and 12 deletions

View File

@ -1,6 +1,6 @@
COMMENT = manipulation and analysis of planar geometric objects
MODPY_EGG_VERSION = 1.8.2
MODPY_EGG_VERSION = 1.8.4
GH_TAGNAME = ${MODPY_EGG_VERSION}
GH_ACCOUNT = shapely
GH_PROJECT = shapely
@ -18,8 +18,7 @@ FLAVOR = python3
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PEP517 = setuptools
# cython and numpy needed to build _vectorized.so
BUILD_DEPENDS +=${RUN_DEPENDS} \
math/py-numpy${MODPY_FLAVOR} \
@ -33,7 +32,7 @@ post-patch:
pre-test:
# gross
cp ${WRKSRC}/${MODPY_TEST_LIBDIR}/shapely/vectorized/_vectorized*.so \
cp ${WRKSRC}/build/lib.openbsd-${OSREV}-${ARCH}-cpython-${MODPY_MAJORMINOR}/shapely/vectorized/_vectorized*.so \
${WRKSRC}/shapely/vectorized/
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (shapely-1.8.2.tar.gz) = cvaZ8Pt57rxsqSQ+YzTXwJ3L/njgHLvXvljGJ3esRto=
SIZE (shapely-1.8.2.tar.gz) = 322064
SHA256 (shapely-1.8.4.tar.gz) = 4nxJqwAZueR79PNVRbKGivNHMeIr51X1byK1J40+Tv0=
SIZE (shapely-1.8.4.tar.gz) = 322701

View File

@ -1,31 +1,49 @@
@conflict py-shapely-*
@pkgpath geo/py-shapely
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}.dist-info/
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}.dist-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/shapely/
lib/python${MODPY_VERSION}/site-packages/shapely/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}_buildcfg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}_buildcfg.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}affinity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}affinity.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}coords.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
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}${MODPY_PYOEXTENSION}
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}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}geos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
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}${MODPY_PYOEXTENSION}
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}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}iterops.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}linref.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}linref.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}ops.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}ops.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}predicates.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}predicates.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}prepared.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}prepared.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}strtree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}strtree.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}topology.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}topology.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}validation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}validation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}wkb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}wkb.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}wkt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/${MODPY_PYCACHE}wkt.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/_buildcfg.py
lib/python${MODPY_VERSION}/site-packages/shapely/_geos.pxi
@ -33,8 +51,11 @@ lib/python${MODPY_VERSION}/site-packages/shapely/affinity.py
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/${MODPY_PYCACHE}cga.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/${MODPY_PYCACHE}cga.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/${MODPY_PYCACHE}polylabel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/${MODPY_PYCACHE}polylabel.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/cga.py
lib/python${MODPY_VERSION}/site-packages/shapely/algorithms/polylabel.py
@ -44,9 +65,13 @@ lib/python${MODPY_VERSION}/site-packages/shapely/errors.py
lib/python${MODPY_VERSION}/site-packages/shapely/examples/
lib/python${MODPY_VERSION}/site-packages/shapely/examples/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/shapely/examples/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/shapely/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/examples/${MODPY_PYCACHE}dissolve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/examples/${MODPY_PYCACHE}dissolve.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/examples/${MODPY_PYCACHE}geoms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/examples/${MODPY_PYCACHE}geoms.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/examples/${MODPY_PYCACHE}intersect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/examples/${MODPY_PYCACHE}intersect.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/examples/dissolve.py
lib/python${MODPY_VERSION}/site-packages/shapely/examples/geoms.py
@ -54,17 +79,29 @@ lib/python${MODPY_VERSION}/site-packages/shapely/examples/intersect.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}/
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}collection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}collection.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}geo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}geo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}linestring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}linestring.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}multilinestring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}multilinestring.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}multipoint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}multipoint.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}multipolygon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}multipolygon.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}point.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}point.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}polygon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}polygon.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}proxy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/${MODPY_PYCACHE}proxy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/base.py
lib/python${MODPY_VERSION}/site-packages/shapely/geometry/collection.py
@ -87,6 +124,7 @@ lib/python${MODPY_VERSION}/site-packages/shapely/prepared.py
lib/python${MODPY_VERSION}/site-packages/shapely/speedups/
lib/python${MODPY_VERSION}/site-packages/shapely/speedups/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/shapely/speedups/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/shapely/speedups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/speedups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
@so lib/python${MODPY_VERSION}/site-packages/shapely/speedups/_speedups.${MODPY_PYC_MAGIC_TAG}so
lib/python${MODPY_VERSION}/site-packages/shapely/speedups/_speedups.pyx
@ -96,6 +134,7 @@ lib/python${MODPY_VERSION}/site-packages/shapely/validation.py
lib/python${MODPY_VERSION}/site-packages/shapely/vectorized/
lib/python${MODPY_VERSION}/site-packages/shapely/vectorized/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/shapely/vectorized/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/shapely/vectorized/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/shapely/vectorized/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
@so lib/python${MODPY_VERSION}/site-packages/shapely/vectorized/_vectorized.${MODPY_PYC_MAGIC_TAG}so
lib/python${MODPY_VERSION}/site-packages/shapely/vectorized/_vectorized.pyx