diff --git a/math/py-heyoka/Makefile b/math/py-heyoka/Makefile index c8a0c52b1e12..8218a6cb2809 100644 --- a/math/py-heyoka/Makefile +++ b/math/py-heyoka/Makefile @@ -1,47 +1,48 @@ PORTNAME= heyoka DISTVERSIONPREFIX= v -DISTVERSION= 0.19.0 -PORTREVISION= 4 +DISTVERSION= 0.20.0 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Python library for ODE integration via Taylor's method and LLVM WWW= https://bluescarni.github.io/heyoka.py/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= pybind11>0:devel/pybind11 \ ${PYNUMPY} LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ libfmt.so:devel/libfmt \ + libgmp.so:math/gmp \ libheyoka.so:math/heyoka \ libmp++.so:math/mppp \ + libmpfr.so:math/mpfr \ libtbb.so:devel/onetbb \ libspdlog.so:devel/spdlog RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} USES= cmake compiler:c++17-lang python:3.7+ USE_PYTHON= flavors USE_GITHUB= yes GH_ACCOUNT= bluescarni GH_PROJECT= ${PORTNAME}.py CMAKE_ON= HEYOKA_PY_ENABLE_IPO CMAKE_ARGS= -DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION:R} TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} do-test: # testsuite based on instructions in https://bluescarni.github.io/heyoka.py/install.html#verifying-the-installation @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -c "import heyoka; heyoka.test.run_test_suite();" # integrate and plot an example @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/example-restricted-three-body-problem.py .include diff --git a/math/py-heyoka/distinfo b/math/py-heyoka/distinfo index 2fc1dd2f9d27..72aeb542d8ff 100644 --- a/math/py-heyoka/distinfo +++ b/math/py-heyoka/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663734102 -SHA256 (bluescarni-heyoka.py-v0.19.0_GH0.tar.gz) = 5191a6976fe89f14c6cde0d69607397db059009fecb0a3390c4b33c29e5d31ea -SIZE (bluescarni-heyoka.py-v0.19.0_GH0.tar.gz) = 101947693 +TIMESTAMP = 1671607325 +SHA256 (bluescarni-heyoka.py-v0.20.0_GH0.tar.gz) = 65c90a5ffb870b4d2d19eef066b56964777f03eb7d081e331ae5bf903bbf94af +SIZE (bluescarni-heyoka.py-v0.20.0_GH0.tar.gz) = 102109366 diff --git a/math/py-heyoka/files/patch-CMakeLists.txt b/math/py-heyoka/files/patch-CMakeLists.txt index 09dff89eed8a..06441196fc2e 100644 --- a/math/py-heyoka/files/patch-CMakeLists.txt +++ b/math/py-heyoka/files/patch-CMakeLists.txt @@ -1,20 +1,19 @@ ---- CMakeLists.txt.orig 2022-09-19 07:53:52 UTC +--- CMakeLists.txt.orig 2022-12-18 12:54:30 UTC +++ CMakeLists.txt -@@ -144,7 +144,7 @@ else() - # and Python3 is *not* found, we try again, this time with the full Development - # component (rather than only Development.Module). This seems to work around the - # issue, for now at least. -- find_package(Python3 QUIET COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS}) -+ find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} QUIET COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS}) +@@ -140,14 +140,14 @@ set(_HEYOKA_PY_PYTHON3_COMPONENTS Interpreter NumPy De + # and Python3 is *not* found, we try again, this time with the full Development + # component (rather than only Development.Module). This seems to work around the + # issue, for now at least. +-find_package(Python3 QUIET COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS}) ++find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} QUIET COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS}) - if(NOT Python3_FOUND) - list(POP_BACK _HEYOKA_PY_PYTHON3_COMPONENTS) -@@ -152,7 +152,7 @@ else() - endif() + if(NOT Python3_FOUND) + list(POP_BACK _HEYOKA_PY_PYTHON3_COMPONENTS) + list(APPEND _HEYOKA_PY_PYTHON3_COMPONENTS Development) endif() -find_package(Python3 QUIET REQUIRED COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS}) +find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} QUIET REQUIRED COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS}) message(STATUS "Python3 interpreter: ${Python3_EXECUTABLE}") message(STATUS "Python3 installation directory: ${Python3_SITEARCH}") diff --git a/math/py-heyoka/pkg-plist b/math/py-heyoka/pkg-plist index 092e2fff0539..22ca7351b0c3 100644 --- a/math/py-heyoka/pkg-plist +++ b/math/py-heyoka/pkg-plist @@ -1,6 +1,9 @@ %%PYTHON_SITELIBDIR%%/heyoka/__init__.py %%PYTHON_SITELIBDIR%%/heyoka/_ensemble_impl.py %%PYTHON_SITELIBDIR%%/heyoka/_sympy_utils.py +%%PYTHON_SITELIBDIR%%/heyoka/_test_mp.py +%%PYTHON_SITELIBDIR%%/heyoka/_test_real.py +%%PYTHON_SITELIBDIR%%/heyoka/_test_real128.py %%PYTHON_SITELIBDIR%%/heyoka/_version.py %%PYTHON_SITELIBDIR%%/heyoka/core%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/heyoka/test.py