From f42471ff183c974fdc3ebdafe74c043d38044d30 Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> Date: Mon, 13 May 2024 22:02:45 +0800 Subject: [PATCH] math/py-hdbscan: Convert to USE_PYTHON=pep517 - Remove cython version check from BUILD_DEPENDS - Bump PORTREVISION for package change --- math/py-hdbscan/Makefile | 6 +++--- math/py-hdbscan/files/patch-pyproject.toml | 6 ++++-- math/py-hdbscan/files/patch-setup.py | 11 +++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 math/py-hdbscan/files/patch-setup.py diff --git a/math/py-hdbscan/Makefile b/math/py-hdbscan/Makefile index 3100bdf287ce..d072564b0adc 100644 --- a/math/py-hdbscan/Makefile +++ b/math/py-hdbscan/Makefile @@ -1,5 +1,6 @@ PORTNAME= hdbscan PORTVERSION= 0.8.33 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,8 +13,7 @@ WWW= https://hdbscan.readthedocs.io/en/latest/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cython>=0<3:lang/cython@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}joblib>=1.0:devel/py-joblib@${PY_FLAVOR} \ @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}joblib>=1.0:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent cython distutils +USE_PYTHON= autoplist concurrent cython pep517 post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/math/py-hdbscan/files/patch-pyproject.toml b/math/py-hdbscan/files/patch-pyproject.toml index b2c10fc2e9d7..8737982fa424 100644 --- a/math/py-hdbscan/files/patch-pyproject.toml +++ b/math/py-hdbscan/files/patch-pyproject.toml @@ -1,9 +1,11 @@ --- pyproject.toml.orig 2023-07-18 17:51:04 UTC +++ pyproject.toml -@@ -3,5 +3,5 @@ requires = [ +@@ -2,6 +2,6 @@ requires = [ + requires = [ "setuptools", "wheel", - "cython<3", +- "cython<3", - "oldest-supported-numpy" ++ "cython", + "numpy" ] diff --git a/math/py-hdbscan/files/patch-setup.py b/math/py-hdbscan/files/patch-setup.py new file mode 100644 index 000000000000..dd9c27940c59 --- /dev/null +++ b/math/py-hdbscan/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2023-07-18 17:51:04 UTC ++++ setup.py +@@ -85,7 +85,7 @@ configuration = { + 'cmdclass': {'build_ext': CustomBuildExtCommand}, + 'test_suite': 'nose.collector', + 'tests_require': ['nose'], +- 'data_files': ('hdbscan/dist_metrics.pxd',) ++ 'package_data': {'': ['hdbscan/dist_metrics.pxd']}, + } + + if not HAVE_CYTHON: -- GitLab