From 242b57272545d9369e3c9b2d0fc73ce6f9413df9 Mon Sep 17 00:00:00 2001
From: Austin Macdonald <austin@dartmouth.edu>
Date: Thu, 6 Apr 2023 14:57:31 -0400
Subject: [PATCH 1/2] Stop using deprecated import internally

---
 nipype/__init__.py                                    | 2 +-
 nipype/interfaces/afni/base.py                        | 4 +++-
 nipype/interfaces/base/core.py                        | 4 +++-
 nipype/interfaces/freesurfer/base.py                  | 3 ++-
 nipype/interfaces/freesurfer/preprocess.py            | 3 ++-
 nipype/interfaces/freesurfer/tests/test_preprocess.py | 4 ++--
 nipype/interfaces/fsl/model.py                        | 2 +-
 nipype/interfaces/fsl/preprocess.py                   | 2 +-
 nipype/interfaces/image.py                            | 3 ++-
 nipype/interfaces/mrtrix3/base.py                     | 4 +++-
 nipype/interfaces/tests/test_image.py                 | 2 +-
 11 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/nipype/__init__.py b/nipype/__init__.py
index 06084e823a..1d63d5b4ae 100644
--- a/nipype/__init__.py
+++ b/nipype/__init__.py
@@ -13,7 +13,7 @@
 """
 import os
 
-# XXX Deprecate this import
+# XXX Deprecated import. Not used internally but could be used externally.
 from looseversion import LooseVersion
 
 from .info import URL as __url__, STATUS as __status__, __version__
diff --git a/nipype/interfaces/afni/base.py b/nipype/interfaces/afni/base.py
index 28dc1dc410..e3b910f8c5 100644
--- a/nipype/interfaces/afni/base.py
+++ b/nipype/interfaces/afni/base.py
@@ -6,7 +6,9 @@
 from sys import platform
 import shutil
 
-from ... import logging, LooseVersion
+from looseversion import LooseVersion
+
+from ... import logging
 from ...utils.filemanip import split_filename, fname_presuffix
 from ..base import (
     CommandLine,
diff --git a/nipype/interfaces/base/core.py b/nipype/interfaces/base/core.py
index 81da68be00..fd2e2c54ca 100644
--- a/nipype/interfaces/base/core.py
+++ b/nipype/interfaces/base/core.py
@@ -16,7 +16,9 @@
 import simplejson as json
 from traits.trait_errors import TraitError
 
-from ... import config, logging, LooseVersion
+from looseversion import LooseVersion
+
+from ... import config, logging
 from ...utils.provenance import write_provenance
 from ...utils.misc import str2bool
 from ...utils.filemanip import (
diff --git a/nipype/interfaces/freesurfer/base.py b/nipype/interfaces/freesurfer/base.py
index 9527e97192..6e9bb5942d 100644
--- a/nipype/interfaces/freesurfer/base.py
+++ b/nipype/interfaces/freesurfer/base.py
@@ -16,7 +16,8 @@
 """
 import os
 
-from ... import LooseVersion
+from looseversion import LooseVersion
+
 from ...utils.filemanip import fname_presuffix
 from ..base import (
     CommandLine,
diff --git a/nipype/interfaces/freesurfer/preprocess.py b/nipype/interfaces/freesurfer/preprocess.py
index ccf783a1e3..6970a70ce5 100644
--- a/nipype/interfaces/freesurfer/preprocess.py
+++ b/nipype/interfaces/freesurfer/preprocess.py
@@ -9,10 +9,11 @@
 import shutil
 import sys
 
+from looseversion import LooseVersion
 import numpy as np
 from nibabel import load
 
-from ... import logging, LooseVersion
+from ... import logging
 from ...utils.filemanip import fname_presuffix, check_depends
 from ..io import FreeSurferSource
 from ..base import (
diff --git a/nipype/interfaces/freesurfer/tests/test_preprocess.py b/nipype/interfaces/freesurfer/tests/test_preprocess.py
index 9743f7bf95..00df9393b6 100644
--- a/nipype/interfaces/freesurfer/tests/test_preprocess.py
+++ b/nipype/interfaces/freesurfer/tests/test_preprocess.py
@@ -4,11 +4,11 @@
 import os
 
 import pytest
-from nipype.testing.fixtures import create_files_in_directory
+from looseversion import LooseVersion
 
+from nipype.testing.fixtures import create_files_in_directory
 from nipype.interfaces import freesurfer
 from nipype.interfaces.freesurfer import Info
-from nipype import LooseVersion
 
 
 @pytest.mark.skipif(freesurfer.no_freesurfer(), reason="freesurfer is not installed")
diff --git a/nipype/interfaces/fsl/model.py b/nipype/interfaces/fsl/model.py
index 50485bac2e..dd8f9adeef 100644
--- a/nipype/interfaces/fsl/model.py
+++ b/nipype/interfaces/fsl/model.py
@@ -11,9 +11,9 @@
 from string import Template
 
 import numpy as np
+from looseversion import LooseVersion
 from nibabel import load
 
-from ... import LooseVersion
 from ...utils.filemanip import simplify_list, ensure_list
 from ...utils.misc import human_order_sorted
 from ...external.due import BibTeX
diff --git a/nipype/interfaces/fsl/preprocess.py b/nipype/interfaces/fsl/preprocess.py
index 80ef25534a..d1cee1744e 100644
--- a/nipype/interfaces/fsl/preprocess.py
+++ b/nipype/interfaces/fsl/preprocess.py
@@ -11,8 +11,8 @@
 
 import numpy as np
 from nibabel import load
+from looseversion import LooseVersion
 
-from ... import LooseVersion
 from ...utils.filemanip import split_filename
 from ..base import (
     TraitedSpec,
diff --git a/nipype/interfaces/image.py b/nipype/interfaces/image.py
index 8ea33647c5..1535b1baf8 100644
--- a/nipype/interfaces/image.py
+++ b/nipype/interfaces/image.py
@@ -4,7 +4,8 @@
 
 from ..utils.filemanip import fname_presuffix
 from .base import SimpleInterface, TraitedSpec, BaseInterfaceInputSpec, traits, File
-from .. import LooseVersion
+
+from looseversion import LooseVersion
 
 
 class RescaleInputSpec(BaseInterfaceInputSpec):
diff --git a/nipype/interfaces/mrtrix3/base.py b/nipype/interfaces/mrtrix3/base.py
index af96b5a9f3..1a0ad94c4d 100644
--- a/nipype/interfaces/mrtrix3/base.py
+++ b/nipype/interfaces/mrtrix3/base.py
@@ -2,7 +2,9 @@
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 # -*- coding: utf-8 -*-
 
-from ... import logging, LooseVersion
+from looseversion import LooseVersion
+
+from ... import logging
 from ...utils.filemanip import which
 from ..base import (
     CommandLineInputSpec,
diff --git a/nipype/interfaces/tests/test_image.py b/nipype/interfaces/tests/test_image.py
index d1ed2578a6..43e0cd0648 100644
--- a/nipype/interfaces/tests/test_image.py
+++ b/nipype/interfaces/tests/test_image.py
@@ -4,10 +4,10 @@
 import nibabel as nb
 import pytest
 
+from looseversion import LooseVersion
 from nibabel.orientations import axcodes2ornt, ornt_transform
 
 from ..image import _as_reoriented_backport, _orientations
-from ... import LooseVersion
 
 nibabel24 = LooseVersion(nb.__version__) >= LooseVersion("2.4.0")
 

From f877dea1584a3bf04654ba681d7aeb3ad1d15c49 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Mon, 17 Apr 2023 08:31:13 -0400
Subject: [PATCH 2/2] Unmark import as to-deprecate

---
 nipype/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nipype/__init__.py b/nipype/__init__.py
index 1d63d5b4ae..09728b62d1 100644
--- a/nipype/__init__.py
+++ b/nipype/__init__.py
@@ -13,7 +13,7 @@
 """
 import os
 
-# XXX Deprecated import. Not used internally but could be used externally.
+# No longer used internally but could be used externally.
 from looseversion import LooseVersion
 
 from .info import URL as __url__, STATUS as __status__, __version__