Skip to content

Commit 2c01772

Browse files
committed
Merge remote-tracking branch 'upstream/maint/1.3.x' into maint/1.8.x
2 parents b1b34dd + 6bc37f3 commit 2c01772

File tree

4 files changed

+22
-21
lines changed

4 files changed

+22
-21
lines changed

.circleci/config.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ jobs:
287287
- run:
288288
name: Validate version
289289
command: |
290-
THISVERSION=$( pipx run hatch version )
290+
THISVERSION=$( python3 get_version.py )
291291
python -m pip install dist/*.tar.gz
292292
mkdir empty
293293
cd empty
@@ -309,15 +309,6 @@ jobs:
309309
command: |
310310
pipx run build
311311
pipx run twine check dist/*
312-
- run:
313-
name: Validate version
314-
command: |
315-
THISVERSION=$( pipx run hatch version )
316-
python -m pip install dist/*.tar.gz
317-
mkdir empty
318-
cd empty
319-
INSTALLED=$( python -c 'import niworkflows; print(niworkflows.__version__)' )
320-
test "${CIRCLE_TAG:-$THISVERSION}" == "$INSTALLED"
321312
- run:
322313
name: Upload to PyPi
323314
command: |

CHANGES.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,16 @@ A list of prominent changes can be found below. (With thanks to Lea Waller for t
434434
* ``NormalizeMotionParams`` now under ``confounds``.
435435
* ``FMRISummary``, ``CompCorVariancePlot``, ``ConfoundsCorrelationPlot`` from ``plotting``
436436

437+
1.3.10 (September 16, 2023)
438+
===========================
439+
Bug-fix release in the 1.3.x series.
440+
441+
Minor maintenance.
442+
443+
* FIX: Compatibility with matplotlib 3.8.0 (#825)
444+
* FIX: Remove unused ANTs parameter that was removed in 2.4.1 (#772)
445+
* MNT: Create a requirements.txt to keep the LTS branch buildable (#798)
446+
437447
1.3.9 (December 21, 2022)
438448
=========================
439449
Bug-fix release in the 1.3.x series.

niworkflows/viz/plots.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -839,8 +839,8 @@ def compcor_variance_plot(
839839
ax[m].set_yticks([])
840840
ax[m].set_yticklabels([])
841841
for tick in ax[m].xaxis.get_major_ticks():
842-
tick.label.set_fontsize("x-small")
843-
tick.label.set_rotation("vertical")
842+
tick.label1.set_fontsize("x-small")
843+
tick.label1.set_rotation("vertical")
844844
for side in ["top", "right", "left"]:
845845
ax[m].spines[side].set_color("none")
846846
ax[m].spines[side].set_visible(False)
@@ -935,9 +935,9 @@ def confounds_correlation_plot(
935935
ax0.tick_params(axis="both", which="both", width=0)
936936

937937
for tick in ax0.xaxis.get_major_ticks():
938-
tick.label.set_fontsize("small")
938+
tick.label1.set_fontsize("small")
939939
for tick in ax0.yaxis.get_major_ticks():
940-
tick.label.set_fontsize("small")
940+
tick.label1.set_fontsize("small")
941941
sns.barplot(
942942
data=gscorr,
943943
x="index",
@@ -954,10 +954,10 @@ def confounds_correlation_plot(
954954
ax1.tick_params(axis="y", which="both", width=5, length=5)
955955

956956
for tick in ax1.xaxis.get_major_ticks():
957-
tick.label.set_fontsize("small")
958-
tick.label.set_rotation("vertical")
957+
tick.label1.set_fontsize("small")
958+
tick.label1.set_rotation("vertical")
959959
for tick in ax1.yaxis.get_major_ticks():
960-
tick.label.set_fontsize("small")
960+
tick.label1.set_fontsize("small")
961961
for side in ["top", "right", "left"]:
962962
ax1.spines[side].set_color("none")
963963
ax1.spines[side].set_visible(False)

niworkflows/viz/utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -699,8 +699,8 @@ def plot_melodic_components(
699699
ax2.tick_params(axis="both", which="major", pad=0)
700700
sns.despine(left=True, bottom=True)
701701
for tick in ax2.xaxis.get_major_ticks():
702-
tick.label.set_fontsize(6)
703-
tick.label.set_color(color_time)
702+
tick.label1.set_fontsize(6)
703+
tick.label1.set_color(color_time)
704704

705705
ax3.plot(
706706
f[0:],
@@ -713,8 +713,8 @@ def plot_melodic_components(
713713
ax3.autoscale_view("tight")
714714
ax3.tick_params(axis="both", which="major", pad=0)
715715
for tick in ax3.xaxis.get_major_ticks():
716-
tick.label.set_fontsize(6)
717-
tick.label.set_color(color_power)
716+
tick.label1.set_fontsize(6)
717+
tick.label1.set_color(color_power)
718718
sns.despine(left=True, bottom=True)
719719

720720
plt.subplots_adjust(hspace=0.5)

0 commit comments

Comments
 (0)