8000 MNT: Drop distutils by effigies · Pull Request #3458 · nipy/nipype · GitHub
[go: up one dir, main page]
Skip to content

MNT: Drop distutils #3458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 10, 2022
Merged

MNT: Drop distutils #3458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30430bc
MNT: Vendor distutils.version to ease transition
effigies Apr 27, 2022
5c7f2db
RF: Import LooseVersion from nipype.external.version
effigies May 10, 2022
12cd44f
MNT: Drop distutils.spawn.find_executable for shutils.which
effigies Apr 27, 2022
71876b3
MNT: Drop networkx<2 hack
effigies Apr 27, 2022
f580aa0
MNT: Purge StrictVersion
effigies Apr 28, 2022
1acd3fa
MNT: Drop unused tools/toollib.py
effigies Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
MNT: Drop distutils.spawn.find_executable for shutils.which
  • Loading branch information
@effigies
effigies committed May 10, 2022
commit 12cd44f17fade0406bf4bfa877e485f44870e11b
4 changes: 2 additions & 2 deletions nipype/interfaces/afni/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""Provide a base interface to AFNI commands."""
import os
from sys import platform
from distutils import spawn
import shutil

from ... import logging, LooseVersion
from ...utils.filemanip import split_filename, fname_presuffix
Expand Down Expand Up @@ -317,7 +317,7 @@ class AFNIPythonCommand(AFNICommand):
def cmd(self):
"""Revise the command path."""
orig_cmd = super(AFNIPythonCommand, self).cmd
found = spawn.find_executable(orig_cmd)
found = shutil.which(orig_cmd)
return found if found is not None else orig_cmd

@property
Expand Down
4 changes: 2 additions & 2 deletions nipype/interfaces/mrtrix3/connectivity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,9 @@ def _parse_inputs(self, skip=None):
skip = []

if not isdefined(self.inputs.in_config):
from distutils.spawn import find_executable
from shutil import which

path = find_executable(self._cmd)
path = which(self._cmd)
if path is None:
path = os.getenv(MRTRIX3_HOME, "/opt/mrtrix3")
else:
Expand Down
0