Date: Sun, 14 Apr 2024 19:07:48 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4b2250f1aaf4 - main - science/py-nibabel: update 5.2.0 =?utf-8?Q?=E2=86=92?= 5.2.1 Message-ID: <202404141907.43EJ7mRP038481@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b2250f1aaf414e63fe23b2f1396500ac7a17846 commit 4b2250f1aaf414e63fe23b2f1396500ac7a17846 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-04-14 15:59:52 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> 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)', '<not found>'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404141907.43EJ7mRP038481>