Merge pull request #820 from effigies/fix/mpl-deprecations

FIX: Replace deprecated Matplotlib functionality

Author: effigies

niworkflows/interfaces/reportlets/registration.py

@@ -32,7 +32,8 @@
 )
 from nipype.interfaces.mixins import reporting
 from nipype.interfaces import freesurfer as fs
-from nipype.interfaces import fsl, ants
+from nipype.interfaces import fsl
+from nipype.interfaces.ants import registration, resampling
 
 from ... import NIWORKFLOWS_LOG
 from . import base as nrb
@@ -82,13 +83,13 @@ def _post_run_hook(self, runtime):
 
 
 class _ANTSRegistrationInputSpecRPT(
-    nrb._SVGReportCapableInputSpec, ants.registration.RegistrationInputSpec
+    nrb._SVGReportCapableInputSpec, registration.RegistrationInputSpec
 ):
     pass
 
 
 class _ANTSRegistrationOutputSpecRPT(
-    reporting.ReportCapableOutputSpec, ants.registration.RegistrationOutputSpec
+    reporting.ReportCapableOutputSpec, registration.RegistrationOutputSpec
 ):
     pass
 
@@ -110,13 +111,13 @@ def _post_run_hook(self, runtime):
 
 
 class _ANTSApplyTransformsInputSpecRPT(
-    nrb._SVGReportCapableInputSpec, ants.resampling.ApplyTransformsInputSpec
+    nrb._SVGReportCapableInputSpec, resampling.ApplyTransformsInputSpec
 ):
     pass
 
 
 class _ANTSApplyTransformsOutputSpecRPT(
-    reporting.ReportCapableOutputSpec, ants.resampling.ApplyTransformsOutputSpec
+    reporting.ReportCapableOutputSpec, resampling.ApplyTransformsOutputSpec
 ):
     pass
 

niworkflows/interfaces/tests/test_bids.py

@@ -300,7 +300,7 @@ def test_DerivativesDataSink_build_path(
         **entities,
     )
 
-    if type(expectation) == type(Exception):
+    if isinstance(expectation, type):
         with pytest.raises(expectation):
             dds.run()
         return

niworkflows/viz/plots.py

@@ -838,9 +838,9 @@ def compcor_variance_plot(
 
         ax[m].set_yticks([])
         ax[m].set_yticklabels([])
-        for tick in ax[m].xaxis.get_major_ticks():
-            tick.label.set_fontsize("x-small")
-            tick.label.set_rotation("vertical")
+        for label in ax[m].xaxis.get_majorticklabels():
+            label.set_fontsize("x-small")
+            label.set_rotation("vertical")
         for side in ["top", "right", "left"]:
             ax[m].spines[side].set_color("none")
             ax[m].spines[side].set_visible(False)
@@ -934,10 +934,10 @@ def confounds_correlation_plot(
     sns.heatmap(corr, linewidths=0.5, cmap="coolwarm", center=0, square=True, ax=ax0)
     ax0.tick_params(axis="both", which="both", width=0)
 
-    for tick in ax0.xaxis.get_major_ticks():
-        tick.label.set_fontsize("small")
-    for tick in ax0.yaxis.get_major_ticks():
-        tick.label.set_fontsize("small")
+    for label in ax0.xaxis.get_majorticklabels():
+        label.set_fontsize("small")
+    for label in ax0.yaxis.get_majorticklabels():
+        label.set_fontsize("small")
     sns.barplot(
         data=gscorr,
         x="index",
@@ -953,11 +953,11 @@ def confounds_correlation_plot(
     ax1.tick_params(axis="x", which="both", width=0)
     ax1.tick_params(axis="y", which="both", width=5, length=5)
 
-    for tick in ax1.xaxis.get_major_ticks():
-        tick.label.set_fontsize("small")
-        tick.label.set_rotation("vertical")
-    for tick in ax1.yaxis.get_major_ticks():
-        tick.label.set_fontsize("small")
+    for label in ax1.xaxis.get_majorticklabels():
+        label.set_fontsize("small")
+        label.set_rotation("vertical")
+    for label in ax1.yaxis.get_majorticklabels():
+        label.set_fontsize("small")
     for side in ["top", "right", "left"]:
         ax1.spines[side].set_color("none")
         ax1.spines[side].set_visible(False)

niworkflows/viz/utils.py

@@ -698,9 +698,9 @@ def plot_melodic_components(
         ax2.autoscale_view("tight")
         ax2.tick_params(axis="both", which="major", pad=0)
         sns.despine(left=True, bottom=True)
-        for tick in ax2.xaxis.get_major_ticks():
-            tick.label.set_fontsize(6)
-            tick.label.set_color(color_time)
+        for label in ax2.xaxis.get_majorticklabels():
+            label.set_fontsize(6)
+            label.set_color(color_time)
 
         ax3.plot(
             f[0:],
@@ -712,9 +712,9 @@ def plot_melodic_components(
         ax3.axes.get_yaxis().set_visible(False)
         ax3.autoscale_view("tight")
         ax3.tick_params(axis="both", which="major", pad=0)
-        for tick in ax3.xaxis.get_major_ticks():
-            tick.label.set_fontsize(6)
-            tick.label.set_color(color_power)
+        for label in ax3.xaxis.get_majorticklabels():
+            label.set_fontsize(6)
+            label.set_color(color_power)
         sns.despine(left=True, bottom=True)
 
     plt.subplots_adjust(hspace=0.5)