From nobody Mon Jan 30 13:06:46 2023 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 4P57jy4ZH6z3cYcn; Mon, 30 Jan 2023 13:06:46 +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 4P57jy2Wlnz3Fjh; Mon, 30 Jan 2023 13:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675084006; 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=8N19floVMrWmsN5XUFt1CqJIA5Wxq2rrmsZzPXcFkSs=; b=xOFTpXmlWCgs1bjz+8Q4+fbplSNauTyR4ibrCQf5h0vz6q/F8ggzHp2ovTSLz5aF67b1ra s+J4E76XnQ9XhFvOZ0tJaaPkf2j8lSmgFdnEVBrmf8IbM3U9yEBq9G5tlgX77jaBeV68fz Sedkvn001IxYymkWaM5Vq0G6naod/sXSUTTcWcUBsBe2KC5xroiYp3CrqDuS/SNk+ALBkK kKjLaUJnACszmGTt0rhDbyOrufKy7zPdVh8z/IqT1Xpp+fC5r3n5EMjjxOBwflYWcGEK1l 9GhRHuZLbEO+a2qf7qOrUOSSwRdJP1LOuRkflslMilOEh6Cps/RVRSwCSqVHQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675084006; 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=8N19floVMrWmsN5XUFt1CqJIA5Wxq2rrmsZzPXcFkSs=; b=P3aMYcwf6vSf8MigEnwgqT86thB8QPaBaX/b6DuNggjT8MOmQFSxv5GoCDqtRXQBExFPvU uPKlP2XtYG4smmpT6ppXHeVd55brlon6G+Jy2PoOgQbRJjB2kwN1ZosXTDFuuXaDnk98vL MIhj8mB8JOZLFP57DNCntsFvYf/UFMmcpI+apl67BSdthGaS8DdZDZB7FASaIQKfHtYbmT yVYUtKWnlOh2St9wH1Ots0Qe5VuUrlDG3HzHDKYXOwDn1QZ8vc++GRd7yIFhevXBjZ1clP cKnw105KqxHCJLkeL+ZboZXG0oOaBSJfOwUiQ57Y7sdvmqUvEaiMyp/Qucvo9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675084006; a=rsa-sha256; cv=none; b=oJkj994RYdd6Ql9fQ1zeh/xWNenCQz7jfDox7fvr508WKCOXaQjuSwu/KPyZm11hMHLxW/ TYKAlUSaFpF6XySNIIlk7Ico/13ST/rFFbKi6G2pRAo/Cvzu/yVwWaaIGN7MJPkGXrobXS IowNnZheD1+fPSmZIawE8m7snNqmESPb0TCbEnT5Uwd/ivcQkwkakRzGlY2mrN8LFpkiZ/ O1KMt+zEkMBwss77EO9digqPKEvoYwpmCJU0qyBcsXzykwkaz81SoQTZw7jlCzx0I6y3YI 0g4wWpFP6CLpvwZIuQbn1YalbMHCRVuz0bgzj7TMEosBGF4h7D128pX3nJnJDw== 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 4P57jy1Yh8z18D1; Mon, 30 Jan 2023 13:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30UD6kmA054145; Mon, 30 Jan 2023 13:06:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UD6kUt054144; Mon, 30 Jan 2023 13:06:46 GMT (envelope-from git) Date: Mon, 30 Jan 2023 13:06:46 GMT Message-Id: <202301301306.30UD6kUt054144@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 1d003c1864b4 - main - graphics/py-h3: Update to 3.7.6 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d003c1864b4219148d0005e473953f70f341bc7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d003c1864b4219148d0005e473953f70f341bc7 commit 1d003c1864b4219148d0005e473953f70f341bc7 Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 12:29:16 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-01-30 12:59:16 +0000 graphics/py-h3: Update to 3.7.6 - Convert to USE_PYTHON=pytest Changes: https://github.com/uber/h3-py/releases --- graphics/py-h3/Makefile | 17 +++++++++-------- graphics/py-h3/distinfo | 6 +++--- graphics/py-h3/files/patch-CMakeLists.txt | 24 ++++++++++++++++++------ 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/graphics/py-h3/Makefile b/graphics/py-h3/Makefile index 1a605849dfe7..47f92cd5f446 100644 --- a/graphics/py-h3/Makefile +++ b/graphics/py-h3/Makefile @@ -1,5 +1,5 @@ PORTNAME= h3 -PORTVERSION= 3.7.4 +PORTVERSION= 3.7.6 CATEGORIES= graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,16 +12,16 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ - h3>=${PORTVERSION:R}:graphics/h3 \ + h3>=3.7.2:graphics/h3 \ ${PYTHON_PKGNAMEPREFIX}scikit-build>=0:devel/py-scikit-build@${PY_FLAVOR} LIB_DEPENDS= libh3.so:graphics/h3 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} USES= localbase:ldflags ninja:build python:3.7+ -USE_PYTHON= autoplist concurrent cython distutils +USE_PYTHON= autoplist concurrent cython distutils pytest CFLAGS+= -I${LOCALBASE}/include/h3 +TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${PYTHON_CMD} OPTIONS_DEFINE= NUMPY OPTIONS_DEFAULT=NUMPY @@ -29,10 +29,11 @@ NUMPY_DESC= NumPy support NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} +post-patch: +# Clean up bundled libraries + @${RM} -r ${WRKSRC}/src/h3lib/ + post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + -do-test: - cd ${WRKSRC} && ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${PYTHON_CMD} -m pytest -rs -v - .include diff --git a/graphics/py-h3/distinfo b/graphics/py-h3/distinfo index b1a8ae91402e..bee1c875524f 100644 --- a/graphics/py-h3/distinfo +++ b/graphics/py-h3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650228794 -SHA256 (h3-3.7.4.tar.gz) = f8edf5a546b31afdcd801b60448ea890ce1ff418fb784335e1329519f13aa85e -SIZE (h3-3.7.4.tar.gz) = 178439 +TIMESTAMP = 1674589590 +SHA256 (h3-3.7.6.tar.gz) = 9bbd3dbac99532fa521d7d2e288ff55877bea3223b070f659ed7b5f8f1f213eb +SIZE (h3-3.7.6.tar.gz) = 178602 diff --git a/graphics/py-h3/files/patch-CMakeLists.txt b/graphics/py-h3/files/patch-CMakeLists.txt index 10490c593a1a..232444f5b742 100644 --- a/graphics/py-h3/files/patch-CMakeLists.txt +++ b/graphics/py-h3/files/patch-CMakeLists.txt @@ -1,14 +1,26 @@ ---- CMakeLists.txt.orig 2020-07-20 21:47:43 UTC +--- CMakeLists.txt.orig 2022-11-24 19:38:22 UTC +++ CMakeLists.txt -@@ -6,16 +6,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) +@@ -6,28 +6,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Always make a release build set(CMAKE_BUILD_TYPE Release) -# Avoid building tooling we won't need for release --set(BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE) --set(BUILD_FILTERS OFF CACHE BOOL "" FORCE) --set(BUILD_GENERATORS OFF CACHE BOOL "" FORCE) --set(BUILD_TESTING OFF CACHE BOOL "" FORCE) +-# See all options with `cmake -LA` in an `h3/build` directory, +-# or at https://h3geo.org/docs/next/core-library/compilation-options/ +-macro(turn_off option_name) +- set(${option_name} OFF CACHE BOOL "" FORCE) +-endmacro() +-turn_off(BUILD_ALLOC_TESTS) +-turn_off(BUILD_BENCHMARKS) +-turn_off(BUILD_FILTERS) +-turn_off(BUILD_FUZZERS) +-turn_off(BUILD_GENERATORS) +-turn_off(BUILD_TESTING) +-turn_off(ENABLE_COVERAGE) +-turn_off(ENABLE_DOCS) +-turn_off(ENABLE_FORMAT) +-turn_off(ENABLE_LIBFUZZER) +-turn_off(ENABLE_LINTING) - -# Build the core library as static -set(BUILD_SHARED_LIBS OFF)