diff --git a/misc/fastscapelib/Makefile b/misc/fastscapelib/Makefile index f12e771e44b3..acf18d4c7001 100644 --- a/misc/fastscapelib/Makefile +++ b/misc/fastscapelib/Makefile @@ -1,25 +1,29 @@ PORTNAME= fastscapelib DISTVERSIONPREFIX= v -DISTVERSION= 0.2.2 +DISTVERSION= 0.3.0 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= Library of efficient algorithms for topographic data WWW= https://fastscapelib.readthedocs.io/en/latest/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= xtensor>0:math/xtensor -RUN_DEPENDS= xtensor>0:math/xtensor +BUILD_DEPENDS= healpix>0:science/healpix \ + xtensor>0:math/xtensor +RUN_DEPENDS= healpix>0:science/healpix \ + xtensor>0:math/xtensor USES= cmake:testing USE_GITHUB= yes GH_ACCOUNT= fastscape-lem CMAKE_TESTING_ON= FS_BUILD_TESTS NO_ARCH= yes +# tests as of 0.3.0: 100% tests passed, 0 tests failed out of 162 + .include diff --git a/misc/fastscapelib/distinfo b/misc/fastscapelib/distinfo index 0f410933e158..b9a8b539f8e0 100644 --- a/misc/fastscapelib/distinfo +++ b/misc/fastscapelib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717650943 -SHA256 (fastscape-lem-fastscapelib-v0.2.2_GH0.tar.gz) = 21cac72a0586d1ceb1080eadbb60a7b7e81a4d6a7b56edbc696f92ff87fc6566 -SIZE (fastscape-lem-fastscapelib-v0.2.2_GH0.tar.gz) = 537207 +TIMESTAMP = 1760501532 +SHA256 (fastscape-lem-fastscapelib-v0.3.0_GH0.tar.gz) = bfd3e8549a9bdd3ae3f0ba0ce4b1d8767d2bb8d163fd6be5d4beb35a9a36bcd0 +SIZE (fastscape-lem-fastscapelib-v0.3.0_GH0.tar.gz) = 733594 diff --git a/misc/fastscapelib/pkg-plist b/misc/fastscapelib/pkg-plist index 96e75d975c40..4ea250a51ea2 100644 --- a/misc/fastscapelib/pkg-plist +++ b/misc/fastscapelib/pkg-plist @@ -1,24 +1,30 @@ include/fastscapelib/algo/pflood.hpp include/fastscapelib/eroders/diffusion_adi.hpp include/fastscapelib/eroders/spl.hpp include/fastscapelib/flow/basin_graph.hpp include/fastscapelib/flow/flow_graph.hpp include/fastscapelib/flow/flow_graph_impl.hpp +include/fastscapelib/flow/flow_kernel.hpp include/fastscapelib/flow/flow_operator.hpp include/fastscapelib/flow/flow_router.hpp include/fastscapelib/flow/flow_snapshot.hpp include/fastscapelib/flow/sink_resolver.hpp include/fastscapelib/grid/base.hpp +include/fastscapelib/grid/healpix_grid.hpp include/fastscapelib/grid/profile_grid.hpp include/fastscapelib/grid/raster_grid.hpp include/fastscapelib/grid/structured_grid.hpp include/fastscapelib/grid/trimesh.hpp include/fastscapelib/utils/consts.hpp +include/fastscapelib/utils/containers.hpp +include/fastscapelib/utils/eigen_containers.hpp +include/fastscapelib/utils/impl/thread_pool_inl.hpp include/fastscapelib/utils/iterators.hpp +include/fastscapelib/utils/thread_pool.hpp include/fastscapelib/utils/union_find.hpp include/fastscapelib/utils/utils.hpp -include/fastscapelib/utils/xtensor_utils.hpp +include/fastscapelib/utils/xtensor_containers.hpp include/fastscapelib/version.hpp lib/cmake/fastscapelib/fastscapelibConfig.cmake lib/cmake/fastscapelib/fastscapelibConfigVersion.cmake lib/cmake/fastscapelib/fastscapelibTargets.cmake diff --git a/misc/py-fastscapelib/Makefile b/misc/py-fastscapelib/Makefile index 42412318de85..9bbc7d6f603c 100644 --- a/misc/py-fastscapelib/Makefile +++ b/misc/py-fastscapelib/Makefile @@ -1,36 +1,36 @@ PORTNAME= fastscapelib DISTVERSIONPREFIX= v -DISTVERSION= 0.2.2 +DISTVERSION= 0.3.0 CATEGORIES= misc PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Library of efficient algorithms for topographic data WWW= https://fastscapelib.readthedocs.io/en/latest/ \ https://github.com/fastscape-lem/fastscapelib LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_13= compilation fails with clang-19, see https://github.com/fastscape-lem/fastscapelib/issues/168 -BROKEN_FreeBSD_15= compilation fails with clang-19, see https://github.com/fastscape-lem/fastscapelib/issues/168 - BUILD_DEPENDS= cmake:devel/cmake-core \ xtensor>0:math/xtensor \ xtensor-python>0:math/xtensor-python \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>0:devel/py-pyproject-metadata@${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} +LIB_DEPENDS= libhealpix_cxx.so:science/healpix RUN_DEPENDS= ${PYNUMPY} USES= python USE_PYTHON= pep517 autoplist pytest USE_GITHUB= yes GH_ACCOUNT= fastscape-lem TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +# tests as of 0.3.0: 174 passed in 131.81s (0:02:11) + .include diff --git a/misc/py-fastscapelib/distinfo b/misc/py-fastscapelib/distinfo index 0acea30dc66f..18edab22ebca 100644 --- a/misc/py-fastscapelib/distinfo +++ b/misc/py-fastscapelib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717651075 -SHA256 (fastscape-lem-fastscapelib-v0.2.2_GH0.tar.gz) = 21cac72a0586d1ceb1080eadbb60a7b7e81a4d6a7b56edbc696f92ff87fc6566 -SIZE (fastscape-lem-fastscapelib-v0.2.2_GH0.tar.gz) = 537207 +TIMESTAMP = 1760416384 +SHA256 (fastscape-lem-fastscapelib-v0.3.0_GH0.tar.gz) = bfd3e8549a9bdd3ae3f0ba0ce4b1d8767d2bb8d163fd6be5d4beb35a9a36bcd0 +SIZE (fastscape-lem-fastscapelib-v0.3.0_GH0.tar.gz) = 733594 diff --git a/misc/py-fastscapelib/files/patch-pyproject.toml b/misc/py-fastscapelib/files/patch-pyproject.toml index 703b73ab414a..fb123612f4a7 100644 --- a/misc/py-fastscapelib/files/patch-pyproject.toml +++ b/misc/py-fastscapelib/files/patch-pyproject.toml @@ -1,11 +1,13 @@ ---- pyproject.toml.orig 2023-10-10 18:00:46 UTC +--- pyproject.toml.orig 2025-06-25 14:33:51 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", +@@ -4,8 +4,8 @@ requires = [ + # pybind11 2.12 added support for numpy 2.0 + # pybind11 doesn't require numpy at build time, but xtensor-python does! + # packages built with numpy 2.x are compatible with numpy 1.xx +- "pybind11>=2.12,<3", +- "numpy>=2.0,<3", ++ "pybind11", + "numpy", ] build-backend = "scikit_build_core.build"