1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-31 05:41:08 +00:00

science/py-nibabel: Fix the failing test

This commit is contained in:
Yuri Victorovich 2023-12-12 12:50:32 -08:00
parent 4937de2010
commit 5e276b8b14
2 changed files with 38 additions and 0 deletions

View File

@ -1,5 +1,6 @@
PORTNAME= nibabel
DISTVERSION= 5.2.0
PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -0,0 +1,37 @@
- 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>'