diff --git a/math/py-cvxpy/Makefile b/math/py-cvxpy/Makefile index 9789972ce189..08f8e632eb57 100644 --- a/math/py-cvxpy/Makefile +++ b/math/py-cvxpy/Makefile @@ -1,39 +1,46 @@ PORTNAME= cvxpy -DISTVERSION= 1.9.0 +DISTVERSION= 1.9.2 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Domain-specific language for modeling convex optimization problems WWW= https://www.cvxpy.org \ https://github.com/cvxpy/cvxpy LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=2.0.0:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=2.0.0:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=1.13.0:science/py-scipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clarabel>=0.5.0:math/py-clarabel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}highspy>=1.11.0:math/py-highspy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}highspy>=1.14.0:math/py-highspy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=2.0.0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}osqp>=1.0.0:math/py-osqp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qdldl>=0.1.7.post0:math/py-qdldl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.13.0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scs>=3.2.4.post1:math/py-scs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sparsediffpy>=0.3.0:math/py-sparsediffpy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}diffcp>0:math/py-diffcp@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist pytest +USE_PYTHON= pep517 autoplist pytest TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +# TestOpRelConeQuad requires MOSEK/COPT/CVXOPT; on FreeBSD only CVXOPT is +# available and it does not achieve the 3-place accuracy these tests expect. +PYTEST_IGNORED_TESTS= TestOpRelConeQuad + post-install: @${STRIP_CMD} \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_cvxcore${PYTHON_TAG}.so -# tests as of 1.9.0: TBD +# tests as of 1.9.2: 2482 passed, 776 skipped (test environment lacks optional solvers), 6 deselected (TestOpRelConeQuad) .include diff --git a/math/py-cvxpy/distinfo b/math/py-cvxpy/distinfo index a4469e062d29..a6b392a986ff 100644 --- a/math/py-cvxpy/distinfo +++ b/math/py-cvxpy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1779173881 -SHA256 (cvxpy-1.9.0.tar.gz) = b392783713d82a0f4c229a9c08f2f0c03fc5e8b23e877dc45617a60dfac06104 -SIZE (cvxpy-1.9.0.tar.gz) = 1885589 +TIMESTAMP = 1784995598 +SHA256 (cvxpy-1.9.2.tar.gz) = b2e939f197a7081a300d5a95812fec8643fabaf23a149abf7e67ca7f89671d92 +SIZE (cvxpy-1.9.2.tar.gz) = 1916772 diff --git a/math/py-cvxpy/files/patch-pyproject.toml b/math/py-cvxpy/files/patch-pyproject.toml index daec8a60337c..faa75baf7f25 100644 --- a/math/py-cvxpy/files/patch-pyproject.toml +++ b/math/py-cvxpy/files/patch-pyproject.toml @@ -1,13 +1,24 @@ -- Use inline table format for license field; the SPDX string format (PEP 639) -- is only supported by setuptools >= 78.0, which is not yet in the ports tree. +-- Drop the setuptools version floor so the port builds with the version of +-- devel/py-setuptools currently in the ports tree. --- pyproject.toml.orig 2026-05-19 08:06:52 UTC +++ pyproject.toml +@@ -67,7 +67,7 @@ requires = [ + "numpy >= 2.0.0", + "scipy >= 1.13.0", + # 68.1.0 Promoted pyproject.toml's [tool.setuptools] out of beta. +- "setuptools >= 68.1.0", ++ "setuptools", + "wheel", + "pybind11" + ] @@ -89,7 +89,7 @@ urls = {Homepage = "https://github.com/cvxpy/cvxpy"} ] requires-python = ">=3.11" urls = {Homepage = "https://github.com/cvxpy/cvxpy"} -license = "Apache-2.0" +license = {text = "Apache-2.0"} authors = [{name = "Steven Diamond", email = "stevend2@stanford.edu"}, {name = "", email = "akshayka@cs.stanford.edu"}, {name = "Eric Chu", email = "echu508@stanford.edu"},