diff --git a/math/py-diffcp/Makefile b/math/py-diffcp/Makefile index 372efac9ac42..afa13a24dfb7 100644 --- a/math/py-diffcp/Makefile +++ b/math/py-diffcp/Makefile @@ -1,32 +1,38 @@ PORTNAME= diffcp -DISTVERSION= 1.0.23 -PORTREVISION= 2 +DISTVERSION= 1.1.9 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Differentiation through cone programs WWW= https://github.com/cvxgrp/diffcp/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.13.2:science/py-scipy@${PY_FLAVOR} -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PY_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PY_DEPENDS} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cvxpy>0:math/py-cvxpy@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=2.0:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=1.10:science/py-scipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scs>=3.0.0:math/py-scs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}threadpoolctl>=1.1:devel/py-threadpoolctl@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clarabel>=0.5.1:math/py-clarabel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cvxpy>=1.6.3:math/py-cvxpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecos>=2.0.10:math/py-ecos@${PY_FLAVOR} -USES= compiler:c++11-lang python +USES= cmake:indirect compiler:c++11-lang python USE_PYTHON= pep517 autoplist pytest TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +# test_clarabel.py::test_threading deadlocks in this environment. +PYTEST_IGNORED_TESTS= test_threading + post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_diffcp${PYTHON_TAG}.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/diffcp/_diffcp${PYTHON_TAG}.so + +# tests as of 1.1.9: 41 passed, 2 deselected, 2 warnings in 5.68s .include diff --git a/math/py-diffcp/distinfo b/math/py-diffcp/distinfo index e576e6e42778..cc1b80516526 100644 --- a/math/py-diffcp/distinfo +++ b/math/py-diffcp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1718822369 -SHA256 (diffcp-1.0.23.tar.gz) = 09fdcb3bc23668ccd09fdf3e20f790518c5b9be1877770bb6c265380c34f2199 -SIZE (diffcp-1.0.23.tar.gz) = 2198434 +TIMESTAMP = 1784997099 +SHA256 (diffcp-1.1.9.tar.gz) = 10016ef0aa221d3d7875210179dffb3dd6010ebd2328efab582e84178b539e2b +SIZE (diffcp-1.1.9.tar.gz) = 2144994 diff --git a/math/py-diffcp/files/patch-pyproject.toml b/math/py-diffcp/files/patch-pyproject.toml deleted file mode 100644 index dce6bde7455a..000000000000 --- a/math/py-diffcp/files/patch-pyproject.toml +++ /dev/null @@ -1,15 +0,0 @@ ---- pyproject.toml.orig 2024-06-19 18:46:39 UTC -+++ pyproject.toml -@@ -2,9 +2,9 @@ requires = [ - requires = [ - "numpy>=1.15,<1.16; python_version=='3.7'", - "numpy>=1.17,<1.18; python_version=='3.8'", -- "numpy>=1.19,<1.20; python_version=='3.9'", -- "numpy>=1.21,<1.22; python_version=='3.10'", -- "numpy>=1.23,<1.24; python_version=='3.11'", -+ "numpy; python_version=='3.9'", -+ "numpy; python_version=='3.10'", -+ "numpy; python_version=='3.11'", - "scipy>=1.1.0", - "pybind11>=2.4", - "setuptools",