Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Apr 2024 03:02:00 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d84c10537ac9 - main - math/py-PuLP: update 2.7.0 =?utf-8?Q?=E2=86=92?= 2.8.0
Message-ID:  <202404120302.43C3209g033499@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d84c10537ac94f57c82b3534ab3224a716fdd772

commit d84c10537ac94f57c82b3534ab3224a716fdd772
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-04-12 02:26:37 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-04-12 03:01:49 +0000

    math/py-PuLP: update 2.7.0 → 2.8.0
    
    Also replace cbc binaries for other systems with FreeBSD binary.
    
    Reported by:    portscout
---
 math/py-PuLP/Makefile | 18 +++++++++++++-----
 math/py-PuLP/distinfo |  6 +++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/math/py-PuLP/Makefile b/math/py-PuLP/Makefile
index ebc3d3a25a0b..0e567d97a2c3 100644
--- a/math/py-PuLP/Makefile
+++ b/math/py-PuLP/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	PuLP
-DISTVERSION=	2.7.0
-PORTREVISION=	1
+DISTVERSION=	2.8.0
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amply>=0.1.2:math/py-amply@${PY_FLAVOR} \
 
 USES=		cpe python
 CPE_VENDOR=	${PORTNAME:tl}project
-USE_PYTHON=	distutils concurrent autoplist
+USE_PYTHON=	distutils concurrent autoplist pytest
+
+TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
@@ -26,7 +27,14 @@ post-patch:
 	@${CP} ${WRKSRC}/pulp/pulp.cfg.linux ${WRKSRC}/pulp/pulp.cfg.freebsd
 	@${REINPLACE_CMD} -E 's/^(CplexPath|PulpCbcPath) = .*/#&/' ${WRKSRC}/pulp/pulp.cfg.freebsd
 
-do-test: install # one test is known to fail: https://github.com/coin-or/pulp/issues/494
-	@cd ${TEST_WRKSRC} && py.test
+post-install: # workaround for https://github.com/coin-or/pulp/issues/740: replace cbc binaries for other systems with the FreeBSD binary
+	for cbc_exe in ${STAGEDIR}${PYTHON_SITELIBDIR}/pulp/solverdir/cbc/*/*/cbc ${WRKSRC}/pulp/solverdir/cbc/*/*/cbc; do \
+		${RM} $${cbc_exe} && \
+		${LN} -s ${LOCALBASE}/bin/cbc $${cbc_exe}; \
+	done
+
+do-test: # one test is known to fail: https://github.com/coin-or/pulp/issues/494
+	#@cd ${TEST_WRKSRC} && py.test
+	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -c "import pulp; pulp.pulpTestAll()"
 
 .include <bsd.port.mk>
diff --git a/math/py-PuLP/distinfo b/math/py-PuLP/distinfo
index 9829ba9a869d..d3c4eae5e448 100644
--- a/math/py-PuLP/distinfo
+++ b/math/py-PuLP/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667614511
-SHA256 (PuLP-2.7.0.tar.gz) = e73ee6b32d639c9b8cf4b4aded334ba158be5f8313544e056f796ace0a10ae63
-SIZE (PuLP-2.7.0.tar.gz) = 1400315
+TIMESTAMP = 1712868648
+SHA256 (PuLP-2.8.0.tar.gz) = 4903bf96110bbab8ed2c68533f90565ebb76aa367d9e4df38e51bf727927c125
+SIZE (PuLP-2.8.0.tar.gz) = 17610412



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404120302.43C3209g033499>