From nobody Thu Aug 15 20:55:51 2024 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 4WlHTM53cvz5Srs9; Thu, 15 Aug 2024 20:55:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlHTM4W9Hz4712; Thu, 15 Aug 2024 20:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723755351; 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=4S2jTjGtOyM8nd6VQZ3WX3zRjNCJ1OKi0oZlUhsm0Yk=; b=OQ6OSyPOXkTsQJMWX9c6PihsByfebon+O7+ZjLi63oXL7nMmDqwxv7whvK2TPxIMuwv4YP l6OLbtq4LDYT6hFQul+ufDt8bEDSWuqdMe8+N82qBkxFpbZkGLF0vZxCXYbOAEljD/Nbqr N1wYNZ2b0o0dYuap5QDqdKaWJ6DH2QrbZ+7tJcN6YnFaFd3MwKZo+Jylmwjx+GmbeFJU69 rSakfLXapBHAlNza5wYUV3fVnUQFxkBAlLympefFSVV+/l00QDJ6molh0JxkO9ISA7FRo7 AdghPuy54cl7VKcPExHtjaLKChUfMS6NaeX5h7FHgJAAeh9tq4usCwsToxzxOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723755351; a=rsa-sha256; cv=none; b=P4RUNTypNEKE1wRbTnGRACN9QytmQgWOFXNu5nv9Xt5ejdPy3ezfCaLjbnmXtPyGNjOdSl cYEdfsVRm8WB1iP4J2HdSYP63shDTCCyGr8HrWWmJcWknx3w/G68ZehyNRiNdlnxq9w69c T1ta1Y9UNqqc89hNGyIm25m2Q0i/oNZsjXMaBMCtnAViiB2r8RoSHmGvaR1DdK741GqGdB 3ZxiB3mL4EpEqWio8Vg1AwBBdwYNm1egVTiSCfNI9gjGvnhfhhCtpMGIZFPTEMImlYjI2V rrQZXqo9X37W3ejQHmnxJRAVDkvFBxfqJQD+tCDRFMKX6389/NpRovSpgKonCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723755351; 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=4S2jTjGtOyM8nd6VQZ3WX3zRjNCJ1OKi0oZlUhsm0Yk=; b=bxaikTbLiXUwJ7DAEWKtrgvGq4nVwhU0c8Eu7iGTtL1TvmYxuFkxVSB3hWL+6zvJjqQMCB 2Io1J8PJ8A2M9Q7cI/WU8AGE+V+niu5Ed533lFPnON1pske197NgdZxGuJgxXK0OiiEOCG EtTUe2f8XhHfw+fJQ3rEURvyuAJkSF1NXonRoHsZIoO8UjckbyMJdthONYpfoDZnyT4xNc ye/VZXoUoSAVtKdGk1Z04gTBj2sJKhQEzjoajGb/YvzObemzzu5LklFlpanmV//dvZHboK 46BqK/NlfQzSHrux9XqcLyxEqRzFhgPc1gK7nlP8cdlCzEXjrD49QJU0nLeWQg== 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 4WlHTM3jk0zf39; Thu, 15 Aug 2024 20:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FKtpwe077894; Thu, 15 Aug 2024 20:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FKtpIL077891; Thu, 15 Aug 2024 20:55:51 GMT (envelope-from git) Date: Thu, 15 Aug 2024 20:55:51 GMT Message-Id: <202408152055.47FKtpIL077891@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: b547bbe3bbeb - main - science/{,py-}crystal: update 3.8.0 =?utf-8?Q?=E2=86=92?= 3.9.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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: b547bbe3bbeb57285057ad16af1931a276378057 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b547bbe3bbeb57285057ad16af1931a276378057 commit b547bbe3bbeb57285057ad16af1931a276378057 Author: Yuri Victorovich AuthorDate: 2024-08-15 20:53:20 +0000 Commit: Yuri Victorovich CommitDate: 2024-08-15 20:55:48 +0000 science/{,py-}crystal: update 3.8.0 → 3.9.0 Reported by: portscout --- science/ncrystal/Makefile | 2 +- science/ncrystal/distinfo | 6 +++--- science/ncrystal/pkg-plist | 23 ++++++++++++++++++++++- science/py-ncrystal/Makefile | 4 ++-- science/py-ncrystal/distinfo | 6 +++--- science/py-ncrystal/files/patch-pyproject.toml | 8 ++++---- 6 files changed, 35 insertions(+), 14 deletions(-) diff --git a/science/ncrystal/Makefile b/science/ncrystal/Makefile index c37964392028..2c2694ce3da0 100644 --- a/science/ncrystal/Makefile +++ b/science/ncrystal/Makefile @@ -1,6 +1,6 @@ PORTNAME= ncrystal DISTVERSIONPREFIX= v -DISTVERSION= 3.8.0 +DISTVERSION= 3.9.0 CATEGORIES= science # physics MAINTAINER= yuri@FreeBSD.org diff --git a/science/ncrystal/distinfo b/science/ncrystal/distinfo index 7e3a7306170a..bf6c2a7bcb23 100644 --- a/science/ncrystal/distinfo +++ b/science/ncrystal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701671658 -SHA256 (mctools-ncrystal-v3.8.0_GH0.tar.gz) = 6b0ee8c894cc888137d571700e1aa9d51be8030837d94cb89e5cd28ba9e782d7 -SIZE (mctools-ncrystal-v3.8.0_GH0.tar.gz) = 1830102 +TIMESTAMP = 1723708943 +SHA256 (mctools-ncrystal-v3.9.0_GH0.tar.gz) = 21465280b7e27c414969807bed776eea5f187499d3ec17f0a1bf437bec69c0b4 +SIZE (mctools-ncrystal-v3.9.0_GH0.tar.gz) = 1896896 diff --git a/science/ncrystal/pkg-plist b/science/ncrystal/pkg-plist index 51dbb9d5fd91..d6b93510e90b 100644 --- a/science/ncrystal/pkg-plist +++ b/science/ncrystal/pkg-plist @@ -18,6 +18,7 @@ include/NCrystal/NCException.hh include/NCrystal/NCFact.hh include/NCrystal/NCFactImpl.hh include/NCrystal/NCFactRequests.hh +include/NCrystal/NCFactThreads.hh include/NCrystal/NCFactTypes.hh include/NCrystal/NCFmt.hh include/NCrystal/NCImmutBuf.hh @@ -27,6 +28,7 @@ include/NCrystal/NCInfoTypes.hh include/NCrystal/NCLoadNCMAT.hh include/NCrystal/NCMatCfg.hh include/NCrystal/NCMem.hh +include/NCrystal/NCMsgCtrl.hh include/NCrystal/NCNCMATData.hh include/NCrystal/NCParseNCMAT.hh include/NCrystal/NCPluginBoilerplate.hh @@ -42,6 +44,7 @@ include/NCrystal/NCTypes.hh include/NCrystal/NCVariant.hh include/NCrystal/NCVersion.hh include/NCrystal/NCrystal.hh +include/NCrystal/internal/NCABIUtils.hh include/NCrystal/internal/NCAbsOOV.hh include/NCrystal/internal/NCAtomDB.hh include/NCrystal/internal/NCAtomDBExtender.hh @@ -56,6 +59,7 @@ include/NCrystal/internal/NCDynLoader.hh include/NCrystal/internal/NCElIncScatter.hh include/NCrystal/internal/NCElIncXS.hh include/NCrystal/internal/NCEqRefl.hh +include/NCrystal/internal/NCFactoryJobs.hh include/NCrystal/internal/NCFactoryUtils.hh include/NCrystal/internal/NCFastConvolve.hh include/NCrystal/internal/NCFileUtils.hh @@ -65,6 +69,7 @@ include/NCrystal/internal/NCFreeGasUtils.hh include/NCrystal/internal/NCGasMixUtils.hh include/NCrystal/internal/NCGaussMos.hh include/NCrystal/internal/NCGaussOnSphere.hh +include/NCrystal/internal/NCHists.hh include/NCrystal/internal/NCIofQHelper.hh include/NCrystal/internal/NCIter.hh include/NCrystal/internal/NCKinUtils.hh @@ -72,12 +77,26 @@ include/NCrystal/internal/NCLCBragg.hh include/NCrystal/internal/NCLCRefModels.hh include/NCrystal/internal/NCLCUtils.hh include/NCrystal/internal/NCLatticeUtils.hh +include/NCrystal/internal/NCMMC_Basket.hh +include/NCrystal/internal/NCMMC_BasketMgr.hh +include/NCrystal/internal/NCMMC_BasketSrcFiller.hh +include/NCrystal/internal/NCMMC_Defs.hh +include/NCrystal/internal/NCMMC_Geom.hh +include/NCrystal/internal/NCMMC_RunSim.hh +include/NCrystal/internal/NCMMC_SimMgrMT.hh +include/NCrystal/internal/NCMMC_Source.hh +include/NCrystal/internal/NCMMC_StdEngine.hh +include/NCrystal/internal/NCMMC_StdTallies.hh +include/NCrystal/internal/NCMMC_Tally.hh +include/NCrystal/internal/NCMMC_Utils.hh include/NCrystal/internal/NCMath.hh include/NCrystal/internal/NCMatrix.hh +include/NCrystal/internal/NCMsg.hh include/NCrystal/internal/NCOrientUtils.hh include/NCrystal/internal/NCPCBragg.hh include/NCrystal/internal/NCPlaneProvider.hh include/NCrystal/internal/NCPointwiseDist.hh +include/NCrystal/internal/NCProcCompBldr.hh include/NCrystal/internal/NCRandUtils.hh include/NCrystal/internal/NCRomberg.hh include/NCrystal/internal/NCRotMatrix.hh @@ -112,7 +131,7 @@ lib/cmake/NCrystal/NCrystalTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/NCrystal/NCrystalTargets.cmake lib/libNCrystal.so lib/libNCrystal.so.3 -lib/libNCrystal.so.3.8.0 +lib/libNCrystal.so.3.9.0 share/NCrystal/data/AcrylicGlass_C5O2H8.ncmat share/NCrystal/data/AgBr_sg225_SilverBromide.ncmat share/NCrystal/data/Ag_sg225.ncmat @@ -250,6 +269,8 @@ share/NCrystal/python/NCrystal/_chooks.py share/NCrystal/python/NCrystal/_common.py share/NCrystal/python/NCrystal/_coreimpl.py share/NCrystal/python/NCrystal/_miscimpl.py +share/NCrystal/python/NCrystal/_mmc.py +share/NCrystal/python/NCrystal/_msg.py share/NCrystal/python/NCrystal/_nclibpath.py share/NCrystal/python/NCrystal/_ncmatimpl.py share/NCrystal/python/NCrystal/_numpy.py diff --git a/science/py-ncrystal/Makefile b/science/py-ncrystal/Makefile index d967b9f26390..cc30d6f6d488 100644 --- a/science/py-ncrystal/Makefile +++ b/science/py-ncrystal/Makefile @@ -1,6 +1,6 @@ PORTNAME= ncrystal DISTVERSIONPREFIX= v -DISTVERSION= 3.8.0 +DISTVERSION= 3.9.0 CATEGORIES= science # physics PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-build>=0.13:devel/py-scikit-build@${PY_FLAVOR} \ cmake:devel/cmake-core RUN_DEPENDS= ${PYNUMPY} diff --git a/science/py-ncrystal/distinfo b/science/py-ncrystal/distinfo index 0479a24bfc6a..5584e98fbb97 100644 --- a/science/py-ncrystal/distinfo +++ b/science/py-ncrystal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701678283 -SHA256 (mctools-ncrystal-v3.8.0_GH0.tar.gz) = 6b0ee8c894cc888137d571700e1aa9d51be8030837d94cb89e5cd28ba9e782d7 -SIZE (mctools-ncrystal-v3.8.0_GH0.tar.gz) = 1830102 +TIMESTAMP = 1723708867 +SHA256 (mctools-ncrystal-v3.9.0_GH0.tar.gz) = 21465280b7e27c414969807bed776eea5f187499d3ec17f0a1bf437bec69c0b4 +SIZE (mctools-ncrystal-v3.9.0_GH0.tar.gz) = 1896896 diff --git a/science/py-ncrystal/files/patch-pyproject.toml b/science/py-ncrystal/files/patch-pyproject.toml index 477838aab7bb..b2affe463ad7 100644 --- a/science/py-ncrystal/files/patch-pyproject.toml +++ b/science/py-ncrystal/files/patch-pyproject.toml @@ -1,10 +1,10 @@ ---- pyproject.toml.orig 2023-11-07 22:10:54 UTC +--- pyproject.toml.orig 2024-08-14 10:12:23 UTC +++ pyproject.toml -@@ -23,7 +23,6 @@ +@@ -23,7 +23,6 @@ requires = [ requires = [ "setuptools>=42", "scikit-build>=0.13", - "cmake>=3.18", - "numpy" + "numpy", + 'importlib_metadata; python_version < "3.8"', ] - build-backend = "setuptools.build_meta"