Merge remote-tracking branch 'upstream/maint/1.5.x' into maint/1.6.x

Author: effigies

.circleci/config.yml

@@ -18,6 +18,7 @@ jobs:
             - build-v1-{{ .Branch }}-{{ .Revision }}
             - build-v1--{{ .Revision }}
             - build-v1-{{ .Branch }}-
+            - build-v1-maint/1.6.x-
             - build-v1-master-
             - build-v1-
           paths:
@@ -98,13 +99,14 @@ jobs:
       - restore_cache:
           keys:
             - env-v2-{{ .Branch }}-
+            - env-v2-maint/1.6.x-
             - env-v2-master-
             - env-v2-
       - run:
           name: Setup git-annex, DataLad & TemplateFlow
           command: |
             apk update && apk add --no-cache coreutils
-            conda install -y -c conda-forge datalad git wget
+            conda install -y -c conda-forge python=*=*cpython datalad git wget
             python -m pip install --no-cache-dir -U datalad-osf templateflow
             git config --global user.name 'NiPreps Bot'
             git config --global user.email '[email protected]'
@@ -117,6 +119,7 @@ jobs:
           keys:
             - data-v3-{{ .Branch }}-{{ epoch }}
             - data-v3-{{ .Branch }}-
+            - data-v3-maint/1.6.x-
             - data-v3-master-
             - data-v3-
       - run:
@@ -183,10 +186,6 @@ jobs:
       - restore_cache:
           keys:
             - build-v1-{{ .Branch }}-{{ .Revision }}
-            - build-v1--{{ .Revision }}
-            - build-v1-{{ .Branch }}-
-            - build-v1-master-
-            - build-v1-
       - run:
           name: Docker authentication
           command: |
@@ -214,9 +213,6 @@ jobs:
       - restore_cache:
           keys:
             - data-v3-{{ .Branch }}-{{ epoch }}
-            - data-v3-{{ .Branch }}-
-            - data-v3-master-
-            - data-v3-
 
       - run:
           name: Run unit tests
@@ -335,10 +331,6 @@ jobs:
       - restore_cache:
           keys:
             - build-v1-{{ .Branch }}-{{ .Revision }}
-            - build-v1--{{ .Revision }}
-            - build-v1-{{ .Branch }}-
-            - build-v1-master-
-            - build-v1-
           paths:
             - /tmp/docker
             - /tmp/images

.github/workflows/pythonpackage.yml

@@ -5,7 +5,7 @@ name: Python package
 
 on:
   push:
-    branches: [ '*' ]
+    branches: [ '**' ]
     tags: [ '*' ]
   pull_request:
     branches: [ master, 'maint/*' ]
@@ -32,8 +32,7 @@ jobs:
           if [[ -z "$COMMIT_MSG" ]]; then
             COMMIT_MSG=$(git show -s --format=%s)
           fi
-          echo $COMMIT_MSG
-          echo "::set-output name=commit_message::$COMMIT_MSG"
+          echo commit_message=$COMMIT_MSG | tee -a $GITHUB_OUTPUT
         env:
           COMMIT_MSG: ${{ github.event.head_commit.message }}
 
@@ -114,14 +113,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
         install: [repo]
         include:
-          - python-version: 3.9
+          - python-version: "3.10"
             install: sdist
-          - python-version: 3.9
+          - python-version: "3.10"
             install: wheel
-          - python-version: 3.9
+          - python-version: "3.10"
             install: editable
 
     env:
@@ -259,8 +258,6 @@ jobs:
       name: Submit to CodeCov
 
   flake8:
-    needs: check_if_skip
-    if: "!contains(needs.check_if_skip.outputs.commit_message, '[skip ci]')"
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

CHANGES.rst

@@ -305,6 +305,16 @@ A list of prominent changes can be found below. (With thanks to Lea Waller for t
     * ``NormalizeMotionParams`` now under ``confounds``.
     * ``FMRISummary``, ``CompCorVariancePlot``, ``ConfoundsCorrelationPlot`` from ``plotting``
 
+1.3.9 (December 21, 2022)
+=========================
+Bug-fix release in the 1.3.x series.
+
+Minor maintenance.
+
+* FIX: Remove deprecated uses of ``np.bool`` for numpy 1.24 compatibility (#764)
+* CI: Update GitHub actions from master (#766)
+* CI: Update CircleCI from master (#765)
+
 1.3.8 (September 14, 2022)
 ==========================
 Bug-fix release in the 1.3.x series

niworkflows/viz/plots.py

@@ -927,7 +927,7 @@ def confounds_correlation_plot(
     ax0 = plt.subplot(gs[0, :10])
     ax1 = plt.subplot(gs[0, 11:])
 
-    mask = np.zeros_like(corr, dtype=np.bool_)
+    mask = np.zeros_like(corr, dtype=bool)
     mask[np.triu_indices_from(mask)] = True
     sns.heatmap(corr, linewidths=0.5, cmap="coolwarm", center=0, square=True, ax=ax0)
     ax0.tick_params(axis="both", which="both", width=0)