Skip to content

Commit c1b3db1

Browse files
committed
PY312: Drop implicit setuptools dependency
1 parent 2723413 commit c1b3db1

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

smriprep/cli/run.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,13 +445,13 @@ def build_workflow(opts, retval):
445445
import warnings
446446
from time import strftime
447447
from subprocess import check_call, CalledProcessError, TimeoutExpired
448-
from pkg_resources import resource_filename as pkgrf
449448

450449
import json
451450
from bids import BIDSLayout
452451
from nipype import logging, config as ncfg
453452
from niworkflows.utils.bids import collect_participants
454453
from ..__about__ import __version__
454+
from ..data import load_resource
455455
from ..workflows.base import init_smriprep_wf
456456

457457
logger = logging.getLogger("nipype.workflow")
@@ -628,12 +628,14 @@ def build_workflow(opts, retval):
628628
boilerplate,
629629
)
630630

631+
boilerplate_bib = load_resource("boilerplate.bib")
632+
631633
# Generate HTML file resolving citations
632634
cmd = [
633635
"pandoc",
634636
"-s",
635637
"--bibliography",
636-
pkgrf("smriprep", "data/boilerplate.bib"),
638+
str(boilerplate_bib),
637639
"--citeproc",
638640
"--metadata",
639641
'pagetitle="sMRIPrep citation boilerplate"',
@@ -651,7 +653,7 @@ def build_workflow(opts, retval):
651653
"pandoc",
652654
"-s",
653655
"--bibliography",
654-
pkgrf("smriprep", "data/boilerplate.bib"),
656+
str(boilerplate_bib),
655657
"--natbib",
656658
str(log_dir / "CITATION.md"),
657659
"-o",
@@ -662,7 +664,7 @@ def build_workflow(opts, retval):
662664
except (FileNotFoundError, CalledProcessError, TimeoutExpired):
663665
logger.warning("Could not generate CITATION.tex file:\n%s", " ".join(cmd))
664666
else:
665-
copyfile(pkgrf("smriprep", "data/boilerplate.bib"), str(log_dir / "CITATION.bib"))
667+
copyfile(str(boilerplate_bib), str(log_dir / "CITATION.bib"))
666668
return retval
667669

668670

smriprep/utils/bids.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,15 @@
2323
"""Utilities to handle BIDS inputs."""
2424
from pathlib import Path
2525
from json import loads
26-
from pkg_resources import resource_filename as pkgrf
2726
from bids.layout import BIDSLayout
2827

28+
from ..data import load_resource
29+
2930

3031
def collect_derivatives(derivatives_dir, subject_id, std_spaces, spec=None, patterns=None):
3132
"""Gather existing derivatives and compose a cache."""
3233
if spec is None or patterns is None:
33-
_spec, _patterns = tuple(
34-
loads(Path(pkgrf("smriprep", "data/io_spec.json")).read_text()).values()
35-
)
34+
_spec, _patterns = tuple(loads(load_resource("io_spec.json").read_text()).values())
3635

3736
if spec is None:
3837
spec = _spec
@@ -92,11 +91,11 @@ def write_derivative_description(bids_dir, deriv_dir):
9291
9392
.. testsetup::
9493
95-
>>> from pkg_resources import resource_filename
94+
>>> from smriprep.data import load_resource
9695
>>> from pathlib import Path
9796
>>> from tempfile import TemporaryDirectory
9897
>>> tmpdir = TemporaryDirectory()
99-
>>> bids_dir = resource_filename('smriprep', 'data/tests')
98+
>>> bids_dir = load_resource('tests')
10099
>>> deriv_desc = Path(tmpdir.name) / 'dataset_description.json'
101100
102101
.. doctest::

smriprep/workflows/anatomical.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
"""Anatomical reference preprocessing workflows."""
2424
import typing as ty
2525

26-
from pkg_resources import resource_filename as pkgr
27-
2826
from nipype import logging
2927
from nipype.pipeline import engine as pe
3028
from nipype.interfaces import (
@@ -50,6 +48,7 @@
5048
from niworkflows.utils.spaces import SpatialReferences, Reference
5149
from niworkflows.utils.misc import add_suffix
5250
from niworkflows.anat.ants import init_brain_extraction_wf, init_n4_only_wf
51+
from ..data import load_resource
5352
from ..interfaces import DerivativesDataSink
5453
from ..utils.misc import apply_lut as _apply_bids_lut, fs_isRunning as _fs_isRunning
5554
from .fit.registration import init_register_template_wf
@@ -1454,7 +1453,7 @@ def init_anat_template_wf(
14541453

14551454
if num_files == 1:
14561455
get1st = pe.Node(niu.Select(index=[0]), name="get1st")
1457-
outputnode.inputs.anat_realign_xfm = [pkgr("smriprep", "data/itkIdentityTransform.txt")]
1456+
outputnode.inputs.anat_realign_xfm = [str(load_resource("itkIdentityTransform.txt"))]
14581457

14591458
# fmt:off
14601459
workflow.connect([

0 commit comments

Comments
 (0)