Date: Thu, 22 Apr 2021 00:27:57 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: 9108929a344d - main - math/py-or-tools: Update 8.1 -> 8.2 Message-ID: <202104220027.13M0Rv09033955@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=9108929a344dcb1a51f0d922c738f9e19a8a2707 commit 9108929a344dcb1a51f0d922c738f9e19a8a2707 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-04-22 00:26:58 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-04-22 00:27:54 +0000 math/py-or-tools: Update 8.1 -> 8.2 Reported by: portscout --- math/py-or-tools/Makefile | 14 +++++++++++--- math/py-or-tools/distinfo | 6 +++--- math/py-or-tools/files/patch-ortools_python_setup.py.in | 6 +++--- math/py-or-tools/pkg-plist | 2 ++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile index b1511cd36122..e9f560b4f180 100644 --- a/math/py-or-tools/Makefile +++ b/math/py-or-tools/Makefile @@ -1,7 +1,6 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v -DISTVERSION= 8.1 -PORTREVISION= 1 +DISTVERSION= 8.2 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -31,9 +30,10 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ RUN_DEPENDS= ${PY_DEPENDS} USES= blaslapack cmake:insource compiler:c++17-lang pkgconfig python:3.6+ +USE_PYTHON= flavors + USE_GITHUB= yes GH_ACCOUNT= google -USE_PYTHON= flavors CMAKE_OFF= BUILD_DEPS INSTALL_BUILD_DEPS BUILD_EXAMPLES CMAKE_ON= BUILD_PYTHON @@ -62,4 +62,12 @@ do-install: # by default cmake installs the whole or-tools project without the p ${RM} -rf ortools-*.dist-info ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" -o -name "*.so.*" | ${XARGS} ${STRIP_CMD} +do-test: install +.for e in arc_flow_cutting_stock_sat.py bus_driver_scheduling_sat.py cover_rectangle_sat.py cvrptw_plot.py qubo_sat.py # list is from examples/python/CMakeLists.txt + @cd ${WRKSRC}/examples/python && \ + ${ECHO} "==> Running ${PORTNAME} test ${e} ..." && \ + ${PYTHON_CMD} ${e} && \ + ${ECHO} "... test ${e} succeeded" +.endfor + .include <bsd.port.mk> diff --git a/math/py-or-tools/distinfo b/math/py-or-tools/distinfo index 3c4d36cc9b7e..524e7a11e888 100644 --- a/math/py-or-tools/distinfo +++ b/math/py-or-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609281777 -SHA256 (google-or-tools-v8.1_GH0.tar.gz) = beb9fe379977033151045d0815d26c628ad99d74d68b9f3b707578492723731e -SIZE (google-or-tools-v8.1_GH0.tar.gz) = 232290953 +TIMESTAMP = 1619044509 +SHA256 (google-or-tools-v8.2_GH0.tar.gz) = cf40715fa5cfeee88e2c8f5583465182c8dedf60b4eb7c4a967b32ff61ac4302 +SIZE (google-or-tools-v8.2_GH0.tar.gz) = 236722388 diff --git a/math/py-or-tools/files/patch-ortools_python_setup.py.in b/math/py-or-tools/files/patch-ortools_python_setup.py.in index bbf9a095c500..a9add07a6e20 100644 --- a/math/py-or-tools/files/patch-ortools_python_setup.py.in +++ b/math/py-or-tools/files/patch-ortools_python_setup.py.in @@ -1,14 +1,14 @@ See https://github.com/google/or-tools/issues/2305 ---- ortools/python/setup.py.in.orig 2020-12-30 17:40:00 UTC +--- ortools/python/setup.py.in.orig 2021-03-02 14:21:44 UTC +++ ortools/python/setup.py.in @@ -42,8 +42,8 @@ setup( version='@PROJECT_VERSION@', packages=find_packages(), install_requires=[ -- 'protobuf >= 3.14.0', +- 'protobuf >= 3.15.3', - 'absl-py >= 0.11', -+ #'protobuf >= 3.14.0', ++ #'protobuf >= 3.15.3', + #'absl-py >= 0.11', ], package_data={ diff --git a/math/py-or-tools/pkg-plist b/math/py-or-tools/pkg-plist index ec166ce99507..81005de37a24 100644 --- a/math/py-or-tools/pkg-plist +++ b/math/py-or-tools/pkg-plist @@ -40,6 +40,8 @@ %%PYTHON_SITELIBDIR%%/ortools/sat/boolean_problem_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_pb2.py %%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_pb2.pyi +%%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_service_pb2.py +%%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_service_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/sat/python/__init__.py %%PYTHON_SITELIBDIR%%/ortools/sat/python/cp_model.py %%PYTHON_SITELIBDIR%%/ortools/sat/python/cp_model_helper.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104220027.13M0Rv09033955>