RF: Use importlib_resources over pkg_resources

Author: effigies

nibabel/__init__.py

@@ -171,11 +171,16 @@ def bench(label=None, verbose=1, extra_argv=None):
     code : ExitCode
         Returns the result of running the tests as a ``pytest.ExitCode`` enum
     """
-    from pkg_resources import resource_filename
+    try:
+        from importlib.resources import as_file, files
+    except ImportError:
+        from importlib_resources import as_file, files
 
-    config = resource_filename('nibabel', 'benchmarks/pytest.benchmark.ini')
     args = []
     if extra_argv is not None:
         args.extend(extra_argv)
-    args.extend(['-c', config])
-    return test(label, verbose, extra_argv=args)
+
+    config_path = files('nibabel') / 'benchmarks/pytest.benchmark.ini'
+    with as_file(config_path) as config:
+        args.extend(['-c', str(config)])
+        return test(label, verbose, extra_argv=args)

nibabel/testing/__init__.py

@@ -7,10 +7,12 @@
 #
 ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
 """Utilities for testing"""
+from __future__ import annotations
 
 import os
 import re
 import sys
+import typing as ty
 import unittest
 import warnings
 from contextlib import nullcontext
@@ -19,24 +21,34 @@
 import numpy as np
 import pytest
 from numpy.testing import assert_array_equal
-from pkg_resources import resource_filename
 
 from .helpers import assert_data_similar, bytesio_filemap, bytesio_round_trip
 from .np_features import memmap_after_ufunc
 
+try:
+    from importlib.abc import Traversable
+    from importlib.resources import as_file, files
+except ImportError:  # PY38
+    from importlib_resources import as_file, files
+    from importlib_resources.abc import Traversable
 
-def test_data(subdir=None, fname=None):
+
+def test_data(
+    subdir: ty.Literal['gifti', 'nicom', 'externals'] | None = None,
+    fname: str | None = None,
+) -> Traversable:
+    parts: tuple[str, ...]
     if subdir is None:
-        resource = os.path.join('tests', 'data')
+        parts = ('tests', 'data')
     elif subdir in ('gifti', 'nicom', 'externals'):
-        resource = os.path.join(subdir, 'tests', 'data')
+        parts = (subdir, 'tests', 'data')
     else:
         raise ValueError(f'Unknown test data directory: {subdir}')
 
     if fname is not None:
-        resource = os.path.join(resource, fname)
+        parts += (fname,)
 
-    return resource_filename('nibabel', resource)
+    return files('nibabel').joinpath(*parts)
 
 
 # set path to example data

nibabel/tests/test_init.py

@@ -1,7 +1,12 @@
+import pathlib
 from unittest import mock
 
 import pytest
-from pkg_resources import resource_filename
+
+try:
+    from importlib.resources import as_file, files
+except ImportError:
+    from importlib_resources import as_file, files
 
 import nibabel as nib
 
@@ -38,12 +43,11 @@ def test_nibabel_test_errors():
 
 
 def test_nibabel_bench():
-    expected_args = ['-c', '--pyargs', 'nibabel']
+    config_path = files('nibabel') / 'benchmarks/pytest.benchmark.ini'
+    if not isinstance(config_path, pathlib.Path):
+        raise unittest.SkipTest('Package is not unpacked; could get temp path')
 
-    try:
-        expected_args.insert(1, resource_filename('nibabel', 'benchmarks/pytest.benchmark.ini'))
-    except:
-        raise unittest.SkipTest('Not installed')
+    expected_args = ['-c', str(config_path), '--pyargs', 'nibabel']
 
     with mock.patch('pytest.main') as pytest_main:
         nib.bench(verbose=0)

nibabel/tests/test_testing.py

@@ -171,12 +171,14 @@ def test_assert_re_in(regex, entries):
 
 
 def test_test_data():
-    assert test_data() == data_path
-    assert test_data() == os.path.abspath(
+    assert str(test_data()) == str(data_path)
+    assert str(test_data()) == os.path.abspath(
         os.path.join(os.path.dirname(__file__), '..', 'tests', 'data')
     )
     for subdir in ('nicom', 'gifti', 'externals'):
-        assert test_data(subdir) == os.path.join(data_path[:-10], subdir, 'tests', 'data')
+        assert str(test_data(subdir)) == os.path.join(
+            data_path.parent.parent, subdir, 'tests', 'data'
+        )
         assert os.path.exists(test_data(subdir))
         assert not os.path.exists(test_data(subdir, 'doesnotexist'))