diff --git a/math/py-Pyomo/Makefile b/math/py-Pyomo/Makefile index 962376ec915a..3741e88b0189 100644 --- a/math/py-Pyomo/Makefile +++ b/math/py-Pyomo/Makefile @@ -1,38 +1,56 @@ PORTNAME= Pyomo -DISTVERSION= 6.8.1 -PORTREVISION= 1 +DISTVERSION= 6.10.1 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Python Optimization Modeling Objects WWW= https://github.com/Pyomo/pyomo \ https://www.pyomo.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libCbc.so:math/cbc # this library is loaded dynamically RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ glpsol:math/glpk TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-parallel>0:devel/py-pytest-parallel@${PY_FLAVOR} TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}docplex>0:math/py-docplex@${PY_FLAVOR} \ casadi>0:math/casadi \ ipopt:math/ipopt USES= python USE_PYTHON= distutils cython concurrent autoplist pytest # tests fail to run, see https://github.com/Pyomo/pyomo/issues/3424 TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +# disable failing tests, see https://github.com/Pyomo/pyomo/issues/3999 +TEST_ARGS= --ignore=pyomo/contrib/sensitivity_toolbox/tests/test_sens.py \ + --ignore=pyomo/contrib/doe/tests \ + --ignore=examples/pyomobook/test_book_examples.py \ + --ignore=pyomo/contrib/parmest/tests \ + --ignore=doc/OnlineDocs/tests/test_examples.py \ + --ignore=pyomo/contrib/pyros/tests/test_grcs.py \ + --ignore=pyomo/environ/tests/test_environ.py \ + --ignore=pyomo/common/tests/test_tee.py \ + --ignore=pyomo/common/tests/test_log.py \ + --ignore=pyomo/common/tests/test_deprecated.py \ + --ignore=pyomo/core/tests/examples/test_pyomo.py \ + --ignore=pyomo/contrib/cspline_external/test/test_parameter_calculation.py \ + --ignore=pyomo/contrib/solver/tests/solvers/test_ipopt.py \ + -ignore=pyomo/dae/tests/test_colloc.py \ + --ignore=pyomo/contrib/multistart/tests/test_multi.py USE_GITHUB= yes GH_PROJECT= pyomo NO_ARCH= yes BINARY_ALIAS= python=${PYTHON_CMD} # for tests +# tests as of 6.10.1: 9321 passed, 7031 skipped, 1743 deselected, 25 xfailed, 15 warnings in 1355.67s (0:22:35) (with failing tests disabled) +# tests as of 6.10.1: 94 failed, 9857 passed, 7170 skipped, 1749 deselected, 25 xfailed, 15 warnings in 571.45s (0:09:31) (with failig tests enabled) + .include diff --git a/math/py-Pyomo/distinfo b/math/py-Pyomo/distinfo index 8b48984df1c1..c3e89d6e65c2 100644 --- a/math/py-Pyomo/distinfo +++ b/math/py-Pyomo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731745977 -SHA256 (Pyomo-pyomo-6.8.1_GH0.tar.gz) = cd24e7de15e14ef12f75bd227b1f6af8c6f0c9499f04b837d70092236010904a -SIZE (Pyomo-pyomo-6.8.1_GH0.tar.gz) = 15043858 +TIMESTAMP = 1784748678 +SHA256 (Pyomo-pyomo-6.10.1_GH0.tar.gz) = 8f37fb977387ecf0c65d9c27cc017fe49bf5154a5eeda0c0a0bc0b6fbde768a0 +SIZE (Pyomo-pyomo-6.10.1_GH0.tar.gz) = 16519384 diff --git a/math/py-Pyomo/files/patch-pyproject.toml b/math/py-Pyomo/files/patch-pyproject.toml new file mode 100644 index 000000000000..4ac7fd16a3de --- /dev/null +++ b/math/py-Pyomo/files/patch-pyproject.toml @@ -0,0 +1,22 @@ +--- pyproject.toml.orig 2026-07-22 22:03:21 UTC ++++ pyproject.toml +@@ -1,7 +1,7 @@ requires = [ + [build-system] + requires = [ + # setuptools 77 for core-metadata version 2.4 +- "setuptools>=77", ++ "setuptools>=61.0", + "wheel", + # leave Cython as an optional, runtime‑selectable extra + # setuptools will still import it from setup.py when requested +@@ -16,8 +16,8 @@ readme = "README.md" + name = "pyomo" + description = "The Pyomo optimization modeling framework" + readme = "README.md" +-license = "BSD-3-Clause" +-license-files = [ "LICENSE.md" ] ++license = {text = "BSD-3-Clause"} ++# license-files removed + authors = [{name = "Pyomo Development Team", email = "pyomo-developers@googlegroups.com"}] + requires-python = ">=3.10" + keywords=['optimization']