diff --git a/math/py-PuLP/Makefile b/math/py-PuLP/Makefile index ae2cde85bb2c..2048adc6be87 100644 --- a/math/py-PuLP/Makefile +++ b/math/py-PuLP/Makefile @@ -1,26 +1,30 @@ PORTNAME= PuLP -DISTVERSION= 2.4 +DISTVERSION= 2.5.0 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= LP modeler written in python LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amply>=0.1.2:math/py-amply@${PY_FLAVOR} \ cbc:math/cbc \ glpsol:math/glpk USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes 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/472 + @cd ${TEST_WRKSRC} && py.test + + .include diff --git a/math/py-PuLP/distinfo b/math/py-PuLP/distinfo index daf041f9aa0a..46117392accd 100644 --- a/math/py-PuLP/distinfo +++ b/math/py-PuLP/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608514274 -SHA256 (PuLP-2.4.tar.gz) = b2aff10989b3692e3a59301a0cb0acddeb25dcea378f8804c86007075eae55b5 -SIZE (PuLP-2.4.tar.gz) = 1395471 +TIMESTAMP = 1629096882 +SHA256 (PuLP-2.5.0.tar.gz) = 5dc7d76bfb1da06ac048066ced75603340d0d7ba8a7dbfce4040d6f126eda0d5 +SIZE (PuLP-2.5.0.tar.gz) = 1391143 diff --git a/math/py-PuLP/files/patch-pulp_apis_core.py b/math/py-PuLP/files/patch-pulp_apis_core.py index e176f80d8e29..267541f62fab 100644 --- a/math/py-PuLP/files/patch-pulp_apis_core.py +++ b/math/py-PuLP/files/patch-pulp_apis_core.py @@ -1,19 +1,12 @@ --- pulp/apis/core.py.orig 2020-06-16 01:55:06 UTC +++ pulp/apis/core.py @@ -149,6 +149,9 @@ elif sys.platform in ['darwin']: operating_system = "osx" arch = '64' PULPCFGFILE += ".osx" +elif sys.platform in ['freebsd']: + operating_system = "freebsd" + PULPCFGFILE += ".freebsd" else: operating_system = "linux" PULPCFGFILE += ".linux" -@@ -375,4 +378,4 @@ try: - return cList - except(ImportError): - def ctypesArrayFill(myList, type = None): -- return None -\ No newline at end of file -+ return None