From nobody Sun Oct 10 18:50:00 2021 X-Original-To: dev-commits-ports-all@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 E0D0B17EE715; Sun, 10 Oct 2021 18:50:00 +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 4HS9w82FHnz3r69; Sun, 10 Oct 2021 18:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2904B12E39; Sun, 10 Oct 2021 18:50:00 +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 19AIo07i051758; Sun, 10 Oct 2021 18:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19AIo0c8051747; Sun, 10 Oct 2021 18:50:00 GMT (envelope-from git) Date: Sun, 10 Oct 2021 18:50:00 GMT Message-Id: <202110101850.19AIo0c8051747@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: 4f22ba27cf19 - main - science/py-PyNE: Add the moab dependency; Install the nuc_data.h5 file; Build in parallel List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 4f22ba27cf193014222474f991358491ba1ac795 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f22ba27cf193014222474f991358491ba1ac795 commit 4f22ba27cf193014222474f991358491ba1ac795 Author: Yuri Victorovich AuthorDate: 2021-10-10 18:48:36 +0000 Commit: Yuri Victorovich CommitDate: 2021-10-10 18:49:56 +0000 science/py-PyNE: Add the moab dependency; Install the nuc_data.h5 file; Build in parallel --- science/py-PyNE/Makefile | 23 ++++++++++++++++++----- science/py-PyNE/distinfo | 4 +++- science/py-PyNE/pkg-plist | 2 ++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/science/py-PyNE/Makefile b/science/py-PyNE/Makefile index 70882d74548d..0c46bc576621 100644 --- a/science/py-PyNE/Makefile +++ b/science/py-PyNE/Makefile @@ -1,15 +1,18 @@ PORTNAME= PyNE DISTVERSION= 0.7.5 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= http://raw.githubusercontent.com/pyne/data/master/:decay \ http://raw.githubusercontent.com/pyne/data/master/:cram \ http://raw.githubusercontent.com/pyne/data/master/:dlc \ - http://raw.githubusercontent.com/pyne/data/master/:clc + http://raw.githubusercontent.com/pyne/data/master/:clc \ + https://github.com/pyne/data/raw/master/:nuc_data PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= decay.tar.gz:decay \ cram.tar.gz:cram \ decay-linux-clang.tar.gz:dlc \ - cram-linux-clang.tar.gz:clc + cram-linux-clang.tar.gz:clc \ + prebuilt_nuc_data.h5:nuc_data DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${DISTNAME}.tar.gz @@ -26,6 +29,7 @@ PY_DEPENDS= ${PYNUMPY} \ BUILD_DEPENDS= cmake:devel/cmake \ ${PY_DEPENDS} LIB_DEPENDS= libhdf5.so:science/hdf5 \ + libMOAB.so:math/moab \ libsz.so:science/szip RUN_DEPENDS= ${PY_DEPENDS} @@ -39,8 +43,15 @@ GH_PROJECT= pyne MAKE_ENV= DESTDIR=${STAGEDIR} FFLAGS+= -fallow-argument-mismatch -PYDISTUTILS_BUILDARGS= --slow # this chooses slow compilation of sources from {decay,cram}.tar.gz - # over incompatible pre-compiled assembly from {decay,cram}-linux-clang.tar.gz +# all arguments are described here: http://pyne.io/install/source.html#source +PY_EXTRA_ARGS= --slow # this chooses slow compilation of sources from {decay,cram}.tar.gz + # over incompatible pre-compiled assembly from {decay,cram}-linux-clang.tar.gz +PY_EXTRA_ARGS+= ${_MAKE_JOBS} +PY_EXTRA_ARGS+= --hdf5 ${LOCALBASE} +PY_EXTRA_ARGS+= --moab ${LOCALBASE} + +PYDISTUTILS_CONFIGUREARGS= ${PY_EXTRA_ARGS} +PYDISTUTILS_BUILDARGS= ${PY_EXTRA_ARGS} post-extract: .for f in decay.tar.gz cram.tar.gz decay-linux-clang.tar.gz cram-linux-clang.tar.gz @@ -48,9 +59,11 @@ post-extract: .endfor do-install: - # install + # install project cd ${INSTALL_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} + # also install nuc_data.h5 because it is referred to in the code and is required by Jupyter notebooks + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/prebuilt_nuc_data.h5 ${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/nuc_data.h5 # strip ${STRIP_CMD} \ ${STAGEDIR}${LOCALBASE}/lib/lib*.so \ diff --git a/science/py-PyNE/distinfo b/science/py-PyNE/distinfo index fc8c2dadf0b6..48f7114e22da 100644 --- a/science/py-PyNE/distinfo +++ b/science/py-PyNE/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1633733586 +TIMESTAMP = 1633887568 SHA256 (PyNE-0.7.5/decay.tar.gz) = aa1aa69cb84685731eb234c046c56f9167a0bcc9686ccd5437f62186ac9bd441 SIZE (PyNE-0.7.5/decay.tar.gz) = 8012492 SHA256 (PyNE-0.7.5/cram.tar.gz) = 5ea1443226234787e0b8ef7f1d4c9cb0a6846b9da00bc843557051ad74e4a2f5 @@ -7,5 +7,7 @@ SHA256 (PyNE-0.7.5/decay-linux-clang.tar.gz) = 6fa05231e7fbfe5994e9a6705131bdcac SIZE (PyNE-0.7.5/decay-linux-clang.tar.gz) = 18904467 SHA256 (PyNE-0.7.5/cram-linux-clang.tar.gz) = 0a7a04b5268db91fea7bec75dbefe3ec23036f9e250aacc6fb353d17d8e84538 SIZE (PyNE-0.7.5/cram-linux-clang.tar.gz) = 20477898 +SHA256 (PyNE-0.7.5/prebuilt_nuc_data.h5) = 77a8fbda6db3ed154766f4a7c134651ba710f52d35304f0e456dc6f7e7a69936 +SIZE (PyNE-0.7.5/prebuilt_nuc_data.h5) = 13021601 SHA256 (PyNE-0.7.5/pyne-pyne-0.7.5_GH0.tar.gz) = 80143d5e232b89ffd89121363c0e1e615acc28c26f5d7682521eb9baf98311c4 SIZE (PyNE-0.7.5/pyne-pyne-0.7.5_GH0.tar.gz) = 9262728 diff --git a/science/py-PyNE/pkg-plist b/science/py-PyNE/pkg-plist index 0e0196d6cbb8..d9ed963b7627 100644 --- a/science/py-PyNE/pkg-plist +++ b/science/py-PyNE/pkg-plist @@ -206,6 +206,7 @@ lib/libpyne.so %%PYTHON_SITELIBDIR%%/pyne/mcnp.py %%PYTHON_SITELIBDIR%%/pyne/mesh.py %%PYTHON_SITELIBDIR%%/pyne/njoy.py +%%PYTHON_SITELIBDIR%%/pyne/nuc_data.h5 %%PYTHON_SITELIBDIR%%/pyne/nucname.pxd %%PYTHON_SITELIBDIR%%/pyne/nucname.so %%PYTHON_SITELIBDIR%%/pyne/openmc_utils.py @@ -224,6 +225,7 @@ lib/libpyne.so %%PYTHON_SITELIBDIR%%/pyne/source.pxd %%PYTHON_SITELIBDIR%%/pyne/source.so %%PYTHON_SITELIBDIR%%/pyne/source_sampling.pxd +%%PYTHON_SITELIBDIR%%/pyne/source_sampling.so %%PYTHON_SITELIBDIR%%/pyne/spatialsolver.py %%PYTHON_SITELIBDIR%%/pyne/spectanalysis.py %%PYTHON_SITELIBDIR%%/pyne/stlcontainers.pxd