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
RF: Import LooseVersion from nipype.external.version
  • Loading branch information
@effigies
effigies committed May 10, 2022
commit 5c7f2db901b648cd03620f892baefa08a8da367c
4 changes: 3 additions & 1 deletion nipype/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

"""
import os
from distutils.version import LooseVersion

# XXX Deprecate this import
from .external.version import LooseVersion

from .info import URL as __url__, STATUS as __status__, __version__
from .utils.config import NipypeConfig
Expand Down
3 changes: 1 addition & 2 deletions nipype/interfaces/dipy/preprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
import os.path as op
import nibabel as nb
import numpy as np
from distutils.version import LooseVersion


from nipype.external.version import LooseVersion
from ... import logging
from ..base import traits, TraitedSpec, File, isdefined
from .base import (
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/dipy/reconstruction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import numpy as np
import nibabel as nb
from distutils.version import LooseVersion
from nipype.external.version import LooseVersion

from ... import logging
from ..base import TraitedSpec, File, traits, isdefined
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/dipy/registration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from distutils.version import LooseVersion
from nipype.external.version import LooseVersion
from ... import logging
from .base import HAVE_DIPY, dipy_version, dipy_to_nipype_interface, get_dipy_workflows

Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/dipy/stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from distutils.version import LooseVersion
from nipype.external.version import LooseVersion
from ... import logging
from .base import HAVE_DIPY, dipy_version, dipy_to_nipype_interface, get_dipy_workflows

Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/dipy/tracks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os.path as op
import numpy as np
import nibabel as nb
from distutils.version import LooseVersion
from nipype.external.version import LooseVersion

from ... import logging
from ..base import TraitedSpec, BaseInterfaceInputSpec, File, isdefined, traits
Expand Down
2 changes: 1 addition & 1 deletion nipype/utils/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import errno
import atexit
from warnings import warn
from distutils.version import LooseVersion
from nipype.external.version import LooseVersion
import configparser
import numpy as np

Expand Down
4 changes: 2 additions & 2 deletions nipype/utils/misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from collections.abc import Iterator
from warnings import warn

from distutils.version import LooseVersion
from nipype.external.version import LooseVersion

import numpy as np

Expand Down Expand Up @@ -145,7 +145,7 @@ def package_check(
packages. Default is *Nipype*.
checker : object, optional
The class that will perform the version checking. Default is
distutils.version.LooseVersion.
nipype.external.version.LooseVersion.
exc_failed_import : Exception, optional
Class of the exception to be thrown if import failed.
exc_failed_check : Exception, optional
Expand Down