CVS commit: pkgsrc/devel/py-dm-tree

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/py-dm-tree
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 15 Apr 2025 16:02:35 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr 15 16:02:35 UTC 2025

Modified Files:
        pkgsrc/devel/py-dm-tree: Makefile PLIST distinfo
        pkgsrc/devel/py-dm-tree/patches: patch-tree_CMakeLists.txt

Log Message:
py-dm-tree: updated to 0.1.9

0.1.9
Dropped support for Python <3.10.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-dm-tree/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-dm-tree/PLIST \
    pkgsrc/devel/py-dm-tree/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/py-dm-tree/patches/patch-tree_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-dm-tree/Makefile
diff -u pkgsrc/devel/py-dm-tree/Makefile:1.4 pkgsrc/devel/py-dm-tree/Makefile:1.5
--- pkgsrc/devel/py-dm-tree/Makefile:1.4        Sun Feb  9 14:44:05 2025
+++ pkgsrc/devel/py-dm-tree/Makefile    Tue Apr 15 16:02:34 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2025/02/09 14:44:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2025/04/15 16:02:34 adam Exp $
 
-DISTNAME=      dm-tree-0.1.8
-PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+DISTNAME=      dm_tree-0.1.9
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/dm-tree/}
 
@@ -11,23 +10,17 @@ HOMEPAGE=   https://github.com/google-deep
 COMMENT=       Library for working with nested data structures
 LICENSE=       apache-2.0
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
 TEST_DEPENDS+= ${PYPKGPREFIX}-absl-py>=0.6.1:../../devel/py-absl-py
 TEST_DEPENDS+= ${PYPKGPREFIX}-attrs>=18.2.0:../../devel/py-attrs
-TEST_DEPENDS+= ${PYPKGPREFIX}-numpy>=1.15.4:../../math/py-numpy
+TEST_DEPENDS+= ${PYPKGPREFIX}-numpy>=1.21:../../math/py-numpy
 TEST_DEPENDS+= ${PYPKGPREFIX}-wrapt>=1.11.2:../../devel/py-wrapt
 
 USE_CXX_FEATURES=      c++14
 USE_LANGUAGES=         c++
 USE_TOOLS+=            cmake gmake
 
-SUBST_CLASSES+=                jobs
-SUBST_MESSAGE.jobs=    Limit parallelism to MAKE_JOBS
-SUBST_STAGE.jobs=      pre-configure
-SUBST_FILES.jobs=      setup.py
-SUBST_SED.jobs=                -e 's,-j{os.cpu_count()},-j${MAKE_JOBS:U1},'
-
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  39
 
 .include "../../devel/abseil/buildlink3.mk"
 .include "../../devel/py-pybind11/buildlink3.mk"

Index: pkgsrc/devel/py-dm-tree/PLIST
diff -u pkgsrc/devel/py-dm-tree/PLIST:1.1 pkgsrc/devel/py-dm-tree/PLIST:1.2
--- pkgsrc/devel/py-dm-tree/PLIST:1.1   Mon Aug  5 20:38:39 2024
+++ pkgsrc/devel/py-dm-tree/PLIST       Tue Apr 15 16:02:34 2025
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2024/08/05 20:38:39 adam Exp $
-${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+@comment $NetBSD: PLIST,v 1.2 2025/04/15 16:02:34 adam Exp $
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE
 ${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/tree/__init__.py
 ${PYSITELIB}/tree/__init__.pyc
Index: pkgsrc/devel/py-dm-tree/distinfo
diff -u pkgsrc/devel/py-dm-tree/distinfo:1.1 pkgsrc/devel/py-dm-tree/distinfo:1.2
--- pkgsrc/devel/py-dm-tree/distinfo:1.1        Mon Aug  5 20:38:39 2024
+++ pkgsrc/devel/py-dm-tree/distinfo    Tue Apr 15 16:02:34 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2024/08/05 20:38:39 adam Exp $
+$NetBSD: distinfo,v 1.2 2025/04/15 16:02:34 adam Exp $
 
-BLAKE2s (dm-tree-0.1.8.tar.gz) = f3c5b7d86694838f606c97cc7b8cc25ca0b9e98f82a3514c4a53626415e62dc0
-SHA512 (dm-tree-0.1.8.tar.gz) = c0a5f5b1ab84c735949d1de922cc4efdd8dc17f521c8ee4b049e288d04f233c272d769260406b1cdefecfb3e0ac9a0836bdded557cf747e70229076254ec6468
-Size (dm-tree-0.1.8.tar.gz) = 35384 bytes
+BLAKE2s (dm_tree-0.1.9.tar.gz) = ae86e87e195279a73a1fa9a91ea25284f1b4c22f7c3a4fea217976eed3eb66dc
+SHA512 (dm_tree-0.1.9.tar.gz) = 356cd07701829f4e6273aebcb1d03b891dbc7ca06df9e87ffea546a20a7b40149b421617aa6afcdc254f3f1eada54386cfcbed35d2e2893be42d81f6d17d0487
+Size (dm_tree-0.1.9.tar.gz) = 35623 bytes
 SHA1 (patch-setup.py) = 92af74d15b7c1663ee237a2080723ffc09899349
-SHA1 (patch-tree_CMakeLists.txt) = f1657471a712fe19538e9eef21c02bea61db4064
+SHA1 (patch-tree_CMakeLists.txt) = 5485f162915f9144ef33d050c798038dd0f6fde0

Index: pkgsrc/devel/py-dm-tree/patches/patch-tree_CMakeLists.txt
diff -u pkgsrc/devel/py-dm-tree/patches/patch-tree_CMakeLists.txt:1.1 pkgsrc/devel/py-dm-tree/patches/patch-tree_CMakeLists.txt:1.2
--- pkgsrc/devel/py-dm-tree/patches/patch-tree_CMakeLists.txt:1.1       Mon Aug  5 20:38:39 2024
+++ pkgsrc/devel/py-dm-tree/patches/patch-tree_CMakeLists.txt   Tue Apr 15 16:02:34 2025
@@ -1,79 +1,76 @@
-$NetBSD: patch-tree_CMakeLists.txt,v 1.1 2024/08/05 20:38:39 adam Exp $
+$NetBSD: patch-tree_CMakeLists.txt,v 1.2 2025/04/15 16:02:34 adam Exp $
 
 Use system pybind11 and absl.
 https://github.com/google-deepmind/tree/pull/73
 
---- tree/CMakeLists.txt.orig   2024-08-05 19:44:05.774867683 +0000
+--- tree/CMakeLists.txt.orig   2025-01-30 17:23:48.000000000 +0000
 +++ tree/CMakeLists.txt
-@@ -51,68 +51,12 @@ if(APPLE)
+@@ -7,8 +7,8 @@ cmake_policy(SET CMP0135 NEW)
+ 
+ project (tree LANGUAGES CXX)
+ 
+-option(USE_SYSTEM_ABSEIL "Force use of system abseil-cpp" OFF)
+-option(USE_SYSTEM_PYBIND11 "Force use of system pybind11" OFF)
++option(USE_SYSTEM_ABSEIL "Force use of system abseil-cpp" ON)
++option(USE_SYSTEM_PYBIND11 "Force use of system pybind11" ON)
+ 
+ # Required for Python.h and python binding.
+ find_package(Python3 COMPONENTS Interpreter Development)
+@@ -57,9 +57,6 @@ if(APPLE)
+   set (CMAKE_FIND_FRAMEWORK LAST)
  endif()
  
- # Fetch pybind to be able to use pybind11_add_module symbol.
--set(PYBIND_VER v2.10.1)
+-# Use `FetchContent` module to manage all external dependencies (i.e.
+-# abseil-cpp and pybind11).
 -include(FetchContent)
--FetchContent_Declare(
--  pybind11
--  GIT_REPOSITORY https://github.com/pybind/pybind11
--  GIT_TAG        ${PYBIND_VER}
--)
--if(NOT pybind11_POPULATED)
--    FetchContent_Populate(pybind11)
--    add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR})
--    include_directories(${pybind11_INCLUDE_DIR})
--endif()
--
--# Needed to disable Abseil tests.
--set (BUILD_TESTING OFF)
--
+ 
+ # Needed to disable Abseil tests.
+ set(BUILD_TESTING OFF)
+@@ -70,45 +67,14 @@ if (USE_SYSTEM_ABSEIL)
+     set(ABSEIL_FIND_PACKAGE_ARGS FIND_PACKAGE_ARGS)
+ endif()
+ 
 -# Include abseil-cpp.
--set(ABSEIL_VER 20210324.2)
--include(ExternalProject)
+-set(ABSEIL_REPO https://github.com/abseil/abseil-cpp)
 -set(ABSEIL_CMAKE_ARGS
--    "-DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/abseil-cpp"
--    "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
--    "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
--    "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
--    "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
--    "-DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}"
--    "-DLIBRARY_OUTPUT_PATH=${CMAKE_SOURCE_DIR}/abseil-cpp/lib")
+-  "-DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/abseil-cpp"
+-  "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
+-  "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
+-  "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
+-  "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
+-  "-DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}"
+-  "-DLIBRARY_OUTPUT_PATH=${CMAKE_SOURCE_DIR}/abseil-cpp/lib"
+-  "-DABSL_PROPAGATE_CXX_STD=ON")
 -if(DEFINED CMAKE_OSX_ARCHITECTURES)
--    set(ABSEIL_CMAKE_ARGS
--        ${ABSEIL_CMAKE_ARGS}
--        "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
+-  set(ABSEIL_CMAKE_ARGS
+-      ${ABSEIL_CMAKE_ARGS}
+-      "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
 -endif()
--ExternalProject_Add(abseil-cpp
--  GIT_REPOSITORY    https://github.com/abseil/abseil-cpp.git
--  GIT_TAG           ${ABSEIL_VER}
--  PREFIX            ${CMAKE_SOURCE_DIR}/abseil-cpp
--  CMAKE_ARGS        ${ABSEIL_CMAKE_ARGS}
--)
--ExternalProject_Get_Property(abseil-cpp install_dir)
--set(abseil_install_dir ${install_dir})
--include_directories (${abseil_install_dir}/include)
+-
+-FetchContent_Declare(
+-  absl
+-  URL         ${ABSEIL_REPO}/archive/refs/tags/20220623.2.tar.gz
+-  URL_HASH    SHA256=773652c0fc276bcd5c461668dc112d0e3b6cde499600bfe3499c5fdda4ed4a5b
+-  CMAKE_ARGS  ${ABSEIL_CMAKE_ARGS}
+-  EXCLUDE_FROM_ALL
+-  ${ABSEIL_FIND_PACKAGE_ARGS})
+-
+ # Try to find pybind11 package system-wide first.
+ if (USE_SYSTEM_PYBIND11)
+     message(STATUS "Use system pybind11: ${USE_SYSTEM_PYBIND11}")
+     set(PYBIND11_FIND_PACKAGE_ARGS FIND_PACKAGE_ARGS)
+ endif()
+ 
+-FetchContent_Declare(
+-  pybind11
+-  URL       https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.tar.gz
+-  URL_HASH  SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad
+-  ${PYBIND11_FIND_PACKAGE_ARGS})
+-
+-FetchContent_MakeAvailable(absl pybind11)
 -
 +find_package(pybind11 REQUIRED CONFIG)
 +find_package(absl REQUIRED)
- 
  # Define pybind11 tree module.
  pybind11_add_module(_tree tree.h tree.cc)
--add_dependencies(_tree abseil-cpp)
--
--if (WIN32 OR MSVC)
--    set(ABSEIL_LIB_PREF "absl")
--    set(LIB_SUFF "lib")
--else()
--    set(ABSEIL_LIB_PREF "libabsl")
--    set(LIB_SUFF "a")
--endif()
--
--# Link abseil static libs.
--# We don't use find_library here to force cmake to build abseil before linking.
--set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate)
--foreach(ABSEIL_LIB IN LISTS ABSEIL_LIBS)
--  target_link_libraries(_tree PRIVATE
--      "${abseil_install_dir}/lib/${ABSEIL_LIB_PREF}_${ABSEIL_LIB}.${LIB_SUFF}")
--endforeach()
-+target_link_libraries(_tree PRIVATE absl::int128 absl::raw_hash_set absl::raw_logging_internal absl::strings absl::throw_delegate)
  
- # Make the module private to tree package.
- set_target_properties(_tree PROPERTIES OUTPUT_NAME tree/_tree)

Prev by Date: CVS commit: pkgsrc/multimedia
Next by Date: CVS commit: pkgsrc/math/py-xarray
Previous by Thread: CVS commit: pkgsrc/multimedia
Next by Thread: CVS commit: pkgsrc/math/py-xarray
Indexes:

Home | Main Index | Thread Index | Old Index