From nobody Sun Apr 14 19:07:48 2024 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 4VHfvS4q34z5Gt1T; Sun, 14 Apr 2024 19:07:48 +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 4VHfvS3y4mz4fxt; Sun, 14 Apr 2024 19:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713121668; 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=R66jDYgcIm8UNS9V6okTYsuUr8F0QpPxQCoXZH7apTs=; b=TeCEfNdJz0vij9oyEM7J9Rt3ckVt1bu8gZnukfpj6GjI4R7rt2jmuZrJABLEnFOqS2xnG0 bHTF8ar2nlnxHzspQNE/T7oEQaWswJ1ljeB+EHapaHZKstI+jBPtn/ibZHV337io1Il/Bh 4+wL8ma6VvY8l851EI/fR1u4DcPM9eb9tcA6npGRuTKooL1HeBxOg8AdPh9lnSf/ADpc3s bJGh/vO7dujudHzm1hCVkwNLPEhbcqB9nWeiCsZGwMjsfYndwmCjCKnFn8XTOeXxTm6Lk+ G7sF8HvTD3MiL67Wa82Qjg2W4kZ2SNAlK4dB5TLJ6/ndm7ILkbYOcE3Ago/owQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713121668; a=rsa-sha256; cv=none; b=XuORfzkeT6OzWGtZm0wTrWCvHS/LOQKCsIizjTGIqUXHCBHntcPACColsExWeMyYpfGtp6 it4MVIVEj5bVOvsQlTJb1ogu1tfgrmO7mHYryRFp02CffWfgd4NOO+u6CLgX5pvxnx1cYZ WzQMfa5g3DBGFl6X8lNrBJyS0rEP4OwmWiF/nHWE3kJNht+udj7zXm7K3cbGn7Kjp8TeE7 GfSNOd26kqVLcxFE7AXzMmUQbzQY+YtQ0LisOn2BxtHuCQBTqDvI1EJot3a8gZ0Gyo12Hc vbI6+Ua+uvF+9p8ItsTddO4p3vsZKukD0AyhoqOJ/htjl53ibkUW7x2QAdWs0Q== 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=1713121668; 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=R66jDYgcIm8UNS9V6okTYsuUr8F0QpPxQCoXZH7apTs=; b=MuXGs97GXnm0MqY4u76b4Z5JvsTTPkwrYbWaOJonT3h2PFBz7htZmyXk4KAOVzaLyXKyAp ZjS7A0peLbGJO1MgNNW3Wk4mHYZkIUskTIGye7eqX+eOoYTgGdFaqqgsvY1ZBY7/iPnDe4 PnexnUULkwrObKfk0CcANbrgA+wZm0fDAzPZAw/qiorBrt1huBgGcNVVkjypyQK4m/4SHs CatiGNNPyW3HjO3dzg/BLTijPhBSO6D4jXvLp0y5Cyl7LohUseqLQaaRSzXUgL32YaB3oI OjfROKbi8vceWJCRVca3Lr1iDQIeIzlCM9iv5mZELs3hO0YZaDrTV2jVxc/xOA== 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 4VHfvS3ZnMzSKM; Sun, 14 Apr 2024 19:07:48 +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 43EJ7md4038484; Sun, 14 Apr 2024 19:07:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43EJ7mRP038481; Sun, 14 Apr 2024 19:07:48 GMT (envelope-from git) Date: Sun, 14 Apr 2024 19:07:48 GMT Message-Id: <202404141907.43EJ7mRP038481@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: 4b2250f1aaf4 - main - science/py-nibabel: update 5.2.0 =?utf-8?Q?=E2=86=92?= 5.2.1 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: 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: 4b2250f1aaf414e63fe23b2f1396500ac7a17846 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b2250f1aaf414e63fe23b2f1396500ac7a17846 commit 4b2250f1aaf414e63fe23b2f1396500ac7a17846 Author: Yuri Victorovich AuthorDate: 2024-04-14 15:59:52 +0000 Commit: Yuri Victorovich CommitDate: 2024-04-14 19:07:37 +0000 science/py-nibabel: update 5.2.0 → 5.2.1 Reported by: portscout --- science/py-nibabel/Makefile | 10 ++++++--- science/py-nibabel/distinfo | 6 +++--- science/py-nibabel/files/patch-fix-tests | 37 -------------------------------- 3 files changed, 10 insertions(+), 43 deletions(-) diff --git a/science/py-nibabel/Makefile b/science/py-nibabel/Makefile index 90dbc234add4..9c8c273ebcef 100644 --- a/science/py-nibabel/Makefile +++ b/science/py-nibabel/Makefile @@ -1,6 +1,5 @@ PORTNAME= nibabel -DISTVERSION= 5.2.0 -PORTREVISION= 1 +DISTVERSION= 5.2.1 CATEGORIES= science python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,9 +15,14 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}packaging>=17:devel/py-packaging@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-doctestplus>0:devel/py-pytest-doctestplus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-httpserver>0:devel/py-pytest-httpserver@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pydicom>0:science/py-pydicom@${PY_FLAVOR} USES= python:3.9+ -USE_PYTHON= pep517 concurrent autoplist pytest # 1 tests fails, see https://github.com/nipy/nibabel/issues/1285 +USE_PYTHON= pep517 concurrent autoplist pytest # 270 tests fail, see https://github.com/nipy/nibabel/issues/1317 NO_ARCH= yes diff --git a/science/py-nibabel/distinfo b/science/py-nibabel/distinfo index 1a3966dd0681..a084cf7c824c 100644 --- a/science/py-nibabel/distinfo +++ b/science/py-nibabel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702404071 -SHA256 (nibabel-5.2.0.tar.gz) = 3df8f1ab981d1bd92f4331d565528d126ab9717fdbd4cfe68f43fcd1c2bf3f52 -SIZE (nibabel-5.2.0.tar.gz) = 4501846 +TIMESTAMP = 1713047802 +SHA256 (nibabel-5.2.1.tar.gz) = b6c80b2e728e4bc2b65f1142d9b8d2287a9102a8bf8477e115ef0d8334559975 +SIZE (nibabel-5.2.1.tar.gz) = 4503320 diff --git a/science/py-nibabel/files/patch-fix-tests b/science/py-nibabel/files/patch-fix-tests deleted file mode 100644 index 1a3db66036b6..000000000000 --- a/science/py-nibabel/files/patch-fix-tests +++ /dev/null @@ -1,37 +0,0 @@ -- fix for the failing test from https://github.com/nipy/nibabel/issues/1285#issuecomment-1852612513 - -diff --git nibabel/pkg_info.py nibabel/pkg_info.py -index 7e816939..7232806a 100644 ---- nibabel/pkg_info.py -+++ nibabel/pkg_info.py -@@ -1,6 +1,7 @@ - from __future__ import annotations - - import sys -+from contextlib import suppress - from subprocess import run - - from packaging.version import Version -@@ -102,14 +103,16 @@ def pkg_commit_hash(pkg_path: str | None = None) -> tuple[str, str]: - ver = Version(__version__) - if ver.local is not None and ver.local.startswith('g'): - return 'installation', ver.local[1:8] -- # maybe we are in a repository -- proc = run( -- ('git', 'rev-parse', '--short', 'HEAD'), -- capture_output=True, -- cwd=pkg_path, -- ) -- if proc.stdout: -- return 'repository', proc.stdout.decode().strip() -+ # maybe we are in a repository, but consider that we may not have git -+ with suppress(FileNotFoundError): -+ proc = run( -+ ('git', 'rev-parse', '--short', 'HEAD'), -+ capture_output=True, -+ cwd=pkg_path, -+ ) -+ if proc.stdout: -+ return 'repository', proc.stdout.decode().strip() -+ - return '(none found)', ''