From nobody Wed Sep 21 06:42:25 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MXTNx4DPTz4cS5X; Wed, 21 Sep 2022 06:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MXTNx3XfPz3G4f; Wed, 21 Sep 2022 06:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663742545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ge3Kc+8BTK0yxkT5lOMV4HMTxxVXXnROMrxafvBgGKo=; b=RxR3Bq14MG19cjH4zI4AgEHAmf9YHX45l/NRv5pskIvtsF6dNdKoAhnR7EFfvKi8qivowR OHeU9BPB6qZM7l2vaU4YOXJm/j0hjLDmP21p3q21k/UsD4knnk81WhpnXoouphCVkuNKjf WIlXLd/JNEjOnLlTfN/JKlonq4kXcnqlidIW7mXnPIZAuImJFRX7mSLhMrbGFANFhascgJ FeVKxJU6sdMVytt20MgBK0Gszs9gI4ectebeGCzd6txbgL/VS/AN7c1IB3VN02ANnou81s t5d/4CEer+9CxC40rw90/Va9Rt6w4bfQTqCfG6L6lQ8I2nFsLrGuBjrTNrLZiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MXTNx2fb5zynL; Wed, 21 Sep 2022 06:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28L6gPdR052088; Wed, 21 Sep 2022 06:42:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28L6gPhg052087; Wed, 21 Sep 2022 06:42:25 GMT (envelope-from git) Date: Wed, 21 Sep 2022 06:42:25 GMT Message-Id: <202209210642.28L6gPhg052087@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 776129dbb318 - main - math/{,py-}heyoka: Update 0.18.0 -> 0.19.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 776129dbb31852ccdfb1180032ee94cff767332c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663742545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ge3Kc+8BTK0yxkT5lOMV4HMTxxVXXnROMrxafvBgGKo=; b=PI4X6phElPjWu4PO/sy1xs44HomGZTqGegdhxpoIjk4MIq5DD9Fjnntq4by0fEBo2VB9hG 5GJdsCprDOFQcM4uMufitlItU3l8xyS0mOi6evRdeftIL+ZkRnvS5yz+a+W2zGueok/qSe 2Hb3mW/eV+f4KHgWHEpvbIEU31TFn2UxLQv1cvmgKlVMMTzvarepWn0nOpZZoGWCLXWtmf 7d3O2qgfX60zL7pjL3OiKvZWXij5Su3dxeQ8LkY1tC0Ez8HUsLkp5C7g54GozaZO+agDfd /clG/hJCSKr0QzwN0/zN29JLfQpTGNxoR51VPMZOhLJEYR3/7XGhr/liwixI8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663742545; a=rsa-sha256; cv=none; b=Atk87FqeH6VXtttgieoG7nFSwJHM/1V2lRTA08+dzg+itxm/xE71rdO40F9Aj1p6i4AMJd WDhHco3YjPPPsdqyXcPQn6T+TvY5aEPJuqC2hNzPaBy8XJe72tyRbDdGUwUM67jf/Lsylj quDsBkQmKWWznVXd2aTyEsleW1rnDbEeVsGAdWfLAO3x4Twyn4zkONNqFgdxX0azNyAqqJ mW/1n5YZsBS7mP1+CERl4W0dqakbIjPaV/I07N1ZpuXt+3iHbyPk7Stvr3/3rtldFABOMx Y+qbuYSRC4YqFjsb7rPDd0jCyfoGjIbCkjRUZCcCzJUdNtXjnnTpaYpwKoVaGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=776129dbb31852ccdfb1180032ee94cff767332c commit 776129dbb31852ccdfb1180032ee94cff767332c Author: Yuri Victorovich AuthorDate: 2022-09-21 06:14:32 +0000 Commit: Yuri Victorovich CommitDate: 2022-09-21 06:42:19 +0000 math/{,py-}heyoka: Update 0.18.0 -> 0.19.0 Reported by: portscout --- math/heyoka/Makefile | 3 +-- math/heyoka/distinfo | 6 +++--- math/heyoka/pkg-plist | 6 ++++-- math/py-heyoka/Makefile | 17 ++++++++++------- math/py-heyoka/distinfo | 6 +++--- math/py-heyoka/files/patch-CMakeLists.txt | 21 +++++++++++++++------ math/py-heyoka/files/patch-heyoka_core.cpp | 10 ---------- 7 files changed, 36 insertions(+), 33 deletions(-) diff --git a/math/heyoka/Makefile b/math/heyoka/Makefile index 3ac77714b7d5..63b8ac5e1789 100644 --- a/math/heyoka/Makefile +++ b/math/heyoka/Makefile @@ -1,7 +1,6 @@ PORTNAME= heyoka DISTVERSIONPREFIX= v -DISTVERSION= 0.18.0 -PORTREVISION= 2 +DISTVERSION= 0.19.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/heyoka/distinfo b/math/heyoka/distinfo index e54e5c3f8765..df32dcdb8d3f 100644 --- a/math/heyoka/distinfo +++ b/math/heyoka/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652286102 -SHA256 (bluescarni-heyoka-v0.18.0_GH0.tar.gz) = 2a14a988d973d9a76424df05d38f89ae64f7a1e1c12131022e338fe2de2dcb94 -SIZE (bluescarni-heyoka-v0.18.0_GH0.tar.gz) = 103041768 +TIMESTAMP = 1663717406 +SHA256 (bluescarni-heyoka-v0.19.0_GH0.tar.gz) = 7a7634379233be778fd6b15090df287787cc429314ec521d0336cdc1ae26642a +SIZE (bluescarni-heyoka-v0.19.0_GH0.tar.gz) = 103075151 diff --git a/math/heyoka/pkg-plist b/math/heyoka/pkg-plist index 069c5af345db..220773c75d09 100644 --- a/math/heyoka/pkg-plist +++ b/math/heyoka/pkg-plist @@ -2,8 +2,10 @@ include/heyoka/callable.hpp include/heyoka/celmec/vsop2013.hpp include/heyoka/config.hpp include/heyoka/detail/binomial.hpp +include/heyoka/detail/cm_utils.hpp include/heyoka/detail/dfloat.hpp include/heyoka/detail/event_detection.hpp +include/heyoka/detail/fmt_compat.hpp include/heyoka/detail/fwd_decl.hpp include/heyoka/detail/igor.hpp include/heyoka/detail/llvm_fwd.hpp @@ -76,5 +78,5 @@ lib/cmake/heyoka/heyoka-config.cmake lib/cmake/heyoka/heyoka_export-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/heyoka/heyoka_export.cmake lib/libheyoka.so -lib/libheyoka.so.18 -lib/libheyoka.so.18.0 +lib/libheyoka.so.19 +lib/libheyoka.so.19.0 diff --git a/math/py-heyoka/Makefile b/math/py-heyoka/Makefile index 8cd01a3d5f46..f51838deb38e 100644 --- a/math/py-heyoka/Makefile +++ b/math/py-heyoka/Makefile @@ -1,7 +1,6 @@ PORTNAME= heyoka DISTVERSIONPREFIX= v -DISTVERSION= 0.18.0 -PORTREVISION= 2 +DISTVERSION= 0.19.0 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,11 +11,13 @@ WWW= https://bluescarni.github.io/heyoka.py/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= pybind11>0:devel/pybind11 +BUILD_DEPENDS= pybind11>0:devel/pybind11 \ + ${PYNUMPY} LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ libfmt.so:devel/libfmt \ libheyoka.so:math/heyoka \ libmp++.so:math/mppp \ + libtbb.so:devel/onetbb \ libspdlog.so:devel/spdlog RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \ @@ -32,12 +33,14 @@ GH_ACCOUNT= bluescarni GH_PROJECT= ${PORTNAME}.py CMAKE_ON= HEYOKA_PY_ENABLE_IPO -CMAKE_ARGS= -DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION} +CMAKE_ARGS= -DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION:R} -do-test: install +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 - @${PYTHON_CMD} -c "import heyoka; heyoka.test.run_test_suite();" + @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -c "import heyoka; heyoka.test.run_test_suite();" # integrate and plot an example - @${PYTHON_CMD} ${FILESDIR}/example-restricted-three-body-problem.py + @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 0c493d315b9c..2fc1dd2f9d27 100644 --- a/math/py-heyoka/distinfo +++ b/math/py-heyoka/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652378005 -SHA256 (bluescarni-heyoka.py-v0.18.0_GH0.tar.gz) = 88082a64dedac71f08f1222d8659befe14edcdcff01158e9a99fcc534d11b97a -SIZE (bluescarni-heyoka.py-v0.18.0_GH0.tar.gz) = 101967972 +TIMESTAMP = 1663734102 +SHA256 (bluescarni-heyoka.py-v0.19.0_GH0.tar.gz) = 5191a6976fe89f14c6cde0d69607397db059009fecb0a3390c4b33c29e5d31ea +SIZE (bluescarni-heyoka.py-v0.19.0_GH0.tar.gz) = 101947693 diff --git a/math/py-heyoka/files/patch-CMakeLists.txt b/math/py-heyoka/files/patch-CMakeLists.txt index 69e357ccfe68..09dff89eed8a 100644 --- a/math/py-heyoka/files/patch-CMakeLists.txt +++ b/math/py-heyoka/files/patch-CMakeLists.txt @@ -1,11 +1,20 @@ ---- CMakeLists.txt.orig 2022-05-11 09:27:30 UTC +--- CMakeLists.txt.orig 2022-09-19 07:53:52 UTC +++ CMakeLists.txt -@@ -136,7 +136,7 @@ if(${heyoka_VERSION} VERSION_LESS ${_HEYOKA_PY_MIN_HEY +@@ -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}) + + if(NOT Python3_FOUND) + list(POP_BACK _HEYOKA_PY_PYTHON3_COMPONENTS) +@@ -152,7 +152,7 @@ else() + endif() endif() - # Python. --find_package(Python3 REQUIRED COMPONENTS Interpreter Development) -+find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} REQUIRED EXACT COMPONENTS Interpreter Development) +-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}") - if(${Python3_VERSION_MINOR} LESS 5) diff --git a/math/py-heyoka/files/patch-heyoka_core.cpp b/math/py-heyoka/files/patch-heyoka_core.cpp deleted file mode 100644 index 71a64aed3772..000000000000 --- a/math/py-heyoka/files/patch-heyoka_core.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- heyoka/core.cpp.orig 2022-07-28 02:38:59 UTC -+++ heyoka/core.cpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include