From nobody Tue Oct 10 20:09:01 2023 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 4S4n6P37Ptz4wGD5; Tue, 10 Oct 2023 20:09:01 +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 4S4n6P2Kbmz3TXL; Tue, 10 Oct 2023 20:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696968541; 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=HStQHpCOCrZbIto/qewa0XKFZHUGRKZkkdTN7/Tswhg=; b=I0uOwWam4IJmMf0XDMUQ0t9ecWqkJ1BGI9uzYd6PdqnXo/KkSZaVHJfc6ZK7Z84br25kM7 6oSVPlKmy80ydypjuYy1o5WCCnLScCgRQJ1p9Osxn+tbSIL3LOVPe2SJgHvc1W8IgcUAfE F64cGVPXscGrmukkCjhRHHjE68vbMlDBUDrqOwz46CSsJGaPVcui0yil7r6eRIw4fOw3vV b67xKJR3YE1fpRnsUdwZ9V6en8W2UMeXfucTLsY6lZnM0RYbvXBfqJns3JXA21DfjqaUe0 5AN7nz8lYiw4opaJe5fzh9CQTV0NiY8WJKssaE1LfmdaBTQig0Nt39/yTPzhwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696968541; a=rsa-sha256; cv=none; b=lwYpNvV0iVmNpJ0twJfV/FbCmJCzFZtJI6INHXG+rQJS+/OIIedVy6+mjXDpweSXH6pdTc psTNu3zAiGGi2gnRc9s64lc1+vLq6FW4+4WIzGlhe4+JUXjied/Aam/AcDVmAYbPlwNze7 tygk/sb1FPFGPDRVuYcufdKIL5CKZKEJ8LqlyDoK39fopsf5ImuQjBsSG3R4r9uQn0sLbe JNGfPAq716S71VeW8zDlTNlQCEYn/WPGi/FAQHaWsx7BpW8j1WHn23zJgfVBgQapS+z19X i/KJ5LsDA6kSVUhf4W5pvjzswGZOSKo0cEeAE5k/G1HgEWtMo++1Xe2jdOSXhA== 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=1696968541; 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=HStQHpCOCrZbIto/qewa0XKFZHUGRKZkkdTN7/Tswhg=; b=M60LecqznugSZZaUoVr5r2YnBhRcgOdVdWmt9tDyfkKLmAqVRc9/hNeA3xdy9iiQpjdTKO SUSUiqxgxkj5kjcn7nEPw27pMISYlP9dKZfrQgCk9Zt3fQXFcswNr73h3X3UJCJ+hvGNvG nHA/rmrlPeL8n3YkTCSAvQoO3/iHrWb1KR1UBd9WVgJF+rHrPxZxE9ITv/auXV+RDSXQUD DVJP3BvXVolUPsm/VcA13h3mi24I8MtPDeLyE/qSx7Q0rRewTNxFSh5s2Ek4+qa3qroQ7h hWmE/A9z6Hllq8Gioc/CGf00JeK6YFXj0dCo9WZJ3hsEe7CAO9dJCjwREfavrg== 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 4S4n6P15lNzs5Z; Tue, 10 Oct 2023 20:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39AK91wb054944; Tue, 10 Oct 2023 20:09:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39AK91pM054941; Tue, 10 Oct 2023 20:09:01 GMT (envelope-from git) Date: Tue, 10 Oct 2023 20:09:01 GMT Message-Id: <202310102009.39AK91pM054941@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: 59a4b7dc1d75 - main - misc/{,py-}fastscapelib: update 0.1.3-53 =?utf-8?Q?=E2=86=92?= 0.2.0 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: 59a4b7dc1d751774dc44af736f1b5ced8baa1aef Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=59a4b7dc1d751774dc44af736f1b5ced8baa1aef commit 59a4b7dc1d751774dc44af736f1b5ced8baa1aef Author: Yuri Victorovich AuthorDate: 2023-10-10 08:59:05 +0000 Commit: Yuri Victorovich CommitDate: 2023-10-10 20:08:58 +0000 misc/{,py-}fastscapelib: update 0.1.3-53 → 0.2.0 Reported by: portscout --- misc/fastscapelib/Makefile | 5 ++--- misc/fastscapelib/distinfo | 6 +++--- misc/fastscapelib/pkg-plist | 6 +++--- misc/py-fastscapelib/Makefile | 16 +++++++--------- misc/py-fastscapelib/distinfo | 6 +++--- misc/py-fastscapelib/files/patch-pyproject.toml | 11 +++++++++++ 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/misc/fastscapelib/Makefile b/misc/fastscapelib/Makefile index 6df1bc0ea60f..af6b76014462 100644 --- a/misc/fastscapelib/Makefile +++ b/misc/fastscapelib/Makefile @@ -1,7 +1,6 @@ PORTNAME= fastscapelib DISTVERSIONPREFIX= v -DISTVERSION= 0.1.3-53 -DISTVERSIONSUFFIX= -g5698347 +DISTVERSION= 0.2.0 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org @@ -19,7 +18,7 @@ USES= cmake:testing USE_GITHUB= yes GH_ACCOUNT= fastscape-lem -CMAKE_TESTING_ON= BUILD_TESTS +CMAKE_TESTING_ON= FS_BUILD_TESTS NO_ARCH= yes diff --git a/misc/fastscapelib/distinfo b/misc/fastscapelib/distinfo index cfde1fb9f4f9..45241831fe53 100644 --- a/misc/fastscapelib/distinfo +++ b/misc/fastscapelib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673219854 -SHA256 (fastscape-lem-fastscapelib-v0.1.3-53-g5698347_GH0.tar.gz) = 57c3e83041ba7b2e7e8bc789711d20fefc68b223c5e689e5801b23d18bc89c3c -SIZE (fastscape-lem-fastscapelib-v0.1.3-53-g5698347_GH0.tar.gz) = 107177 +TIMESTAMP = 1696927095 +SHA256 (fastscape-lem-fastscapelib-v0.2.0_GH0.tar.gz) = 4029657425908b3fc4ef41339bd9db564b0308a4874316c2fdb4c67696db26d9 +SIZE (fastscape-lem-fastscapelib-v0.2.0_GH0.tar.gz) = 537682 diff --git a/misc/fastscapelib/pkg-plist b/misc/fastscapelib/pkg-plist index 80ba359ae5e0..b550d3d4b3ae 100644 --- a/misc/fastscapelib/pkg-plist +++ b/misc/fastscapelib/pkg-plist @@ -4,8 +4,9 @@ include/fastscapelib/consts.hpp include/fastscapelib/diffusion_adi.hpp include/fastscapelib/flow_graph.hpp include/fastscapelib/flow_graph_impl.hpp +include/fastscapelib/flow_operator.hpp include/fastscapelib/flow_router.hpp -include/fastscapelib/flow_routing.hpp +include/fastscapelib/flow_snapshot.hpp include/fastscapelib/iterators.hpp include/fastscapelib/pflood.hpp include/fastscapelib/profile_grid.hpp @@ -13,12 +14,11 @@ include/fastscapelib/raster_grid.hpp include/fastscapelib/sink_resolver.hpp include/fastscapelib/spl.hpp include/fastscapelib/structured_grid.hpp +include/fastscapelib/trimesh.hpp include/fastscapelib/union_find.hpp -include/fastscapelib/unstructured_mesh.hpp include/fastscapelib/utils.hpp include/fastscapelib/version.hpp include/fastscapelib/xtensor_utils.hpp lib/cmake/fastscapelib/fastscapelibConfig.cmake lib/cmake/fastscapelib/fastscapelibConfigVersion.cmake lib/cmake/fastscapelib/fastscapelibTargets.cmake -libdata/pkgconfig/fastscapelib.pc diff --git a/misc/py-fastscapelib/Makefile b/misc/py-fastscapelib/Makefile index ca4efc083585..4adce043a483 100644 --- a/misc/py-fastscapelib/Makefile +++ b/misc/py-fastscapelib/Makefile @@ -1,8 +1,6 @@ PORTNAME= fastscapelib DISTVERSIONPREFIX= v -DISTVERSION= 0.1.3-53 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -g5698347 +DISTVERSION= 0.2.0 CATEGORIES= misc PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,23 +9,23 @@ COMMENT= Library of efficient algorithms for topographic data WWW= https://fastscapelib.readthedocs.io/en/latest/ LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/../LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ - pybind11>0:devel/pybind11 \ xtensor>0:math/xtensor \ xtensor-python>0:math/xtensor-python \ - ${PYNUMPY} + ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} USES= python -USE_PYTHON= distutils autoplist pytest +USE_PYTHON= pep517 autoplist pytest USE_GITHUB= yes GH_ACCOUNT= fastscape-lem -WRKSRC_SUBDIR= python - TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .include diff --git a/misc/py-fastscapelib/distinfo b/misc/py-fastscapelib/distinfo index cfde1fb9f4f9..ed532a98eb9b 100644 --- a/misc/py-fastscapelib/distinfo +++ b/misc/py-fastscapelib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673219854 -SHA256 (fastscape-lem-fastscapelib-v0.1.3-53-g5698347_GH0.tar.gz) = 57c3e83041ba7b2e7e8bc789711d20fefc68b223c5e689e5801b23d18bc89c3c -SIZE (fastscape-lem-fastscapelib-v0.1.3-53-g5698347_GH0.tar.gz) = 107177 +TIMESTAMP = 1696926495 +SHA256 (fastscape-lem-fastscapelib-v0.2.0_GH0.tar.gz) = 4029657425908b3fc4ef41339bd9db564b0308a4874316c2fdb4c67696db26d9 +SIZE (fastscape-lem-fastscapelib-v0.2.0_GH0.tar.gz) = 537682 diff --git a/misc/py-fastscapelib/files/patch-pyproject.toml b/misc/py-fastscapelib/files/patch-pyproject.toml new file mode 100644 index 000000000000..703b73ab414a --- /dev/null +++ b/misc/py-fastscapelib/files/patch-pyproject.toml @@ -0,0 +1,11 @@ +--- pyproject.toml.orig 2023-10-10 18:00:46 UTC ++++ pyproject.toml +@@ -4,7 +4,7 @@ requires = [ + "pybind11", + # TODO: replace by "numpy>=1.25.0,<2" when dropping py3.8 support. + # https://github.com/scipy/oldest-supported-numpy/issues/76 +- "oldest-supported-numpy", ++ "numpy", + ] + build-backend = "scikit_build_core.build" +