Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Jan 2024 03:14:52 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: 70ccd4b4ba42 - main - science/py-PyNE: update 0.7.7 =?utf-8?Q?=E2=86=92?= 0.7.8
Message-ID:  <202401220314.40M3EqXQ071563@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=70ccd4b4ba4208ba028022e186276662bc8f7f8f

commit 70ccd4b4ba4208ba028022e186276662bc8f7f8f
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-01-22 03:14:37 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-01-22 03:14:47 +0000

    science/py-PyNE: update 0.7.7 → 0.7.8
---
 science/py-PyNE/Makefile  | 21 +++++++++++++--------
 science/py-PyNE/distinfo  | 26 +++++++++++++-------------
 science/py-PyNE/pkg-plist |  8 ++++----
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/science/py-PyNE/Makefile b/science/py-PyNE/Makefile
index 2499c89e02f4..8630a8f24b48 100644
--- a/science/py-PyNE/Makefile
+++ b/science/py-PyNE/Makefile
@@ -1,12 +1,11 @@
 PORTNAME=	PyNE
-DISTVERSION=	0.7.7
-PORTREVISION=	4
+DISTVERSION=	0.7.8
 CATEGORIES=	science # physics
 MASTER_SITES=	https://raw.githubusercontent.com/pyne/data/master/:decay \
 		https://raw.githubusercontent.com/pyne/data/master/:cram \
 		https://raw.githubusercontent.com/pyne/data/master/:dlc \
 		https://raw.githubusercontent.com/pyne/data/master/:clc \
-		https://github.com/pyne/data/master/:nuc_data
+		https://raw.githubusercontent.com/pyne/data/master/:nuc_data
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	decay.tar.gz:decay \
 		cram.tar.gz:cram \
@@ -24,17 +23,20 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BROKEN_armv7=	clang runs out of memory
-BROKEN_FreeBSD_14=	fails to build: no member named std in namespace std
 
-PY_DEPENDS=	${PYNUMPY} \
+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
+		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}progress>0:devel/py-progress@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tables>0:devel/py-tables@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}tables>0:devel/py-tables@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} # the dependency list is only in ubuntu.sh, see https://github.com/pyne/pyne/issues/1518
+PY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}OpenMC>0:science/py-OpenMC@${PY_FLAVOR}
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
-		libMOAB.so:math/moab \
-		libsz.so:science/libaec
+		libMOAB.so:math/moab
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler:c++17-lang fortran python
@@ -45,6 +47,7 @@ GH_ACCOUNT=	pyne
 GH_PROJECT=	pyne
 
 MAKE_ENV=	DESTDIR=${STAGEDIR}
+TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 FFLAGS+=	-fallow-argument-mismatch
 
 # all arguments are described here: http://pyne.io/install/source.html#source
@@ -70,6 +73,8 @@ do-install:
 		${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
+	# remove stray files
+	${RM} ${STAGEDIR}${PREFIX}/bin/ubuntu.sh
 	# strip
 	${STRIP_CMD} \
 		${STAGEDIR}${LOCALBASE}/lib/lib*.so \
diff --git a/science/py-PyNE/distinfo b/science/py-PyNE/distinfo
index 22131a2bb2ea..500e242a84dd 100644
--- a/science/py-PyNE/distinfo
+++ b/science/py-PyNE/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1653068226
-SHA256 (PyNE-0.7.7/decay.tar.gz) = aa1aa69cb84685731eb234c046c56f9167a0bcc9686ccd5437f62186ac9bd441
-SIZE (PyNE-0.7.7/decay.tar.gz) = 8012492
-SHA256 (PyNE-0.7.7/cram.tar.gz) = 5ea1443226234787e0b8ef7f1d4c9cb0a6846b9da00bc843557051ad74e4a2f5
-SIZE (PyNE-0.7.7/cram.tar.gz) = 2110526
-SHA256 (PyNE-0.7.7/decay-linux-clang.tar.gz) = 6fa05231e7fbfe5994e9a6705131bdcac2fc5845e362d3607e96c46ed418a0db
-SIZE (PyNE-0.7.7/decay-linux-clang.tar.gz) = 18904467
-SHA256 (PyNE-0.7.7/cram-linux-clang.tar.gz) = 0a7a04b5268db91fea7bec75dbefe3ec23036f9e250aacc6fb353d17d8e84538
-SIZE (PyNE-0.7.7/cram-linux-clang.tar.gz) = 20477898
-SHA256 (PyNE-0.7.7/prebuilt_nuc_data.h5) = 77a8fbda6db3ed154766f4a7c134651ba710f52d35304f0e456dc6f7e7a69936
-SIZE (PyNE-0.7.7/prebuilt_nuc_data.h5) = 13021601
-SHA256 (PyNE-0.7.7/pyne-pyne-0.7.7_GH0.tar.gz) = 3cc59621825cee343ea764174f974c4aecea91da44e1be99029784c90b8481ea
-SIZE (PyNE-0.7.7/pyne-pyne-0.7.7_GH0.tar.gz) = 9262860
+TIMESTAMP = 1705890283
+SHA256 (PyNE-0.7.8/decay.tar.gz) = aa1aa69cb84685731eb234c046c56f9167a0bcc9686ccd5437f62186ac9bd441
+SIZE (PyNE-0.7.8/decay.tar.gz) = 8012492
+SHA256 (PyNE-0.7.8/cram.tar.gz) = 5ea1443226234787e0b8ef7f1d4c9cb0a6846b9da00bc843557051ad74e4a2f5
+SIZE (PyNE-0.7.8/cram.tar.gz) = 2110526
+SHA256 (PyNE-0.7.8/decay-linux-clang.tar.gz) = 6fa05231e7fbfe5994e9a6705131bdcac2fc5845e362d3607e96c46ed418a0db
+SIZE (PyNE-0.7.8/decay-linux-clang.tar.gz) = 18904467
+SHA256 (PyNE-0.7.8/cram-linux-clang.tar.gz) = 0a7a04b5268db91fea7bec75dbefe3ec23036f9e250aacc6fb353d17d8e84538
+SIZE (PyNE-0.7.8/cram-linux-clang.tar.gz) = 20477898
+SHA256 (PyNE-0.7.8/prebuilt_nuc_data.h5) = 77a8fbda6db3ed154766f4a7c134651ba710f52d35304f0e456dc6f7e7a69936
+SIZE (PyNE-0.7.8/prebuilt_nuc_data.h5) = 13021601
+SHA256 (PyNE-0.7.8/pyne-pyne-0.7.8_GH0.tar.gz) = 91b5052fb409ff54d1cd2a40476feed112e2d75bf150eef6454b83400dacd25e
+SIZE (PyNE-0.7.8/pyne-pyne-0.7.8_GH0.tar.gz) = 9381089
diff --git a/science/py-PyNE/pkg-plist b/science/py-PyNE/pkg-plist
index 6fcdc21b811c..c429e2018ed7 100644
--- a/science/py-PyNE/pkg-plist
+++ b/science/py-PyNE/pkg-plist
@@ -38,10 +38,10 @@ include/pyne/tally.h
 include/pyne/transmuters.h
 include/pyne/utils.h
 lib/libpyne.so
-%%PYTHON_SITELIBDIR%%/pyne-0.7.7-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/pyne-0.7.7-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/pyne-0.7.7-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/pyne-0.7.7-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/pyne-0.7.8-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/pyne-0.7.8-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/pyne-0.7.8-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/pyne-0.7.8-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/pyne/__init__.pxd
 %%PYTHON_SITELIBDIR%%/pyne/__init__.py
 %%PYTHON_SITELIBDIR%%/pyne/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401220314.40M3EqXQ071563>