Merge branch 'master' into jpeg2000

.codespellrc

@@ -0,0 +1,4 @@
+[codespell]
+skip = .git,.venv,venvs,*.svg,_build
+# te -- TE as codespell is case insensitive
+ignore-words-list = bu,nd,te

.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- DO NOT DELETE THIS! 
+<!-- DO NOT DELETE THIS!
 This template is used to facilitate issue resolution.
 All text in <!-> tags will not be displayed.
 -->
@@ -20,5 +20,5 @@ Choose one:
 - [ ] Container
 <!-- If selected, please provide container name and tag"-->
 
-- Heudiconv version: 
+- Heudiconv version:
 <!-- To check: run heudiconv with just the --version flag -->

.github/workflows/codespell.yml

@@ -0,0 +1,19 @@
+---
+name: Codespell
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Codespell
+        uses: codespell-project/actions-codespell@v2

.github/workflows/docker.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -20,12 +20,22 @@ jobs:
         working-directory: utils
 
       - name: Build Docker image
-        run: docker build -t nipy/heudiconv:master .
+        run: |
+          # build only if not release tag, i.e. has some "-" in describe
+          # so we do not duplicate work with release workflow.
+          git describe --match 'v[0-9]*' | grep -q -e - && \
+              docker build \
+                -t nipy/heudiconv:master \
+                -t nipy/heudiconv:unstable \
+                .
 
       - name: Push Docker image
         run: |
-          docker login -u "$DOCKER_LOGIN" --password-stdin <<<"$DOCKER_TOKEN"
-          docker push nipy/heudiconv:master
+          git describe --match 'v[0-9]*' | grep -q -e - && (
+              docker login -u "$DOCKER_LOGIN" --password-stdin <<<"$DOCKER_TOKEN"
+              docker push nipy/heudiconv:master
+              docker push nipy/heudiconv:unstable
+          )
         env:
           DOCKER_LOGIN: ${{ secrets.DOCKER_LOGIN }}
           DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}

.github/workflows/lint.yml

@@ -0,0 +1,27 @@
+name: Linters
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up environment
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade tox
+
+      - name: Run linters
+        run: tox -e lint

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')"
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -67,8 +67,9 @@ jobs:
         run: |
           docker build \
             -t nipy/heudiconv:master \
+            -t nipy/heudiconv:unstable \
             -t nipy/heudiconv:latest \
-            -t nipy/heudiconv:"$(git describe)" \
+            -t nipy/heudiconv:"$(git describe | sed -e 's,^v,,g')" \
             .
 
       - name: Push Docker images

.github/workflows/test.yml

@@ -18,9 +18,10 @@ jobs:
           - '3.8'
           - '3.9'
           - '3.10'
+          - '3.11'
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/typing.yml

@@ -0,0 +1,27 @@
+name: Type-check
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  typing:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade tox
+
+      - name: Run type checker
+        run: tox -e typing

.gitignore

@@ -1,11 +1,13 @@
+*.egg-info/
 *.pyc
 .cache/
 .coverage
-*.egg-info/
 .idea/
-venvs/
+.tox/
+.vscode/
 _build/
+_version.py
 build/
 dist/
-.vscode/
-_version.py
+sample_nifti.json
+venvs/

.mailmap

@@ -1,5 +1,26 @@
-Mathias Goncalves <[email protected]> <[email protected]>
-Matteo Visconti di Oleggio Castello <[email protected]>
-Matteo Visconti di Oleggio Castello <[email protected]>
-Matteo Visconti di Oleggio Castello <[email protected]>
+Basile Pinsard <[email protected]>
 Chris Filo Gorgolewski <[email protected]> Chris Gorgolewski <[email protected]>
+Christopher J. Markiewicz <[email protected]>
+Dae Houlihan <[email protected]> Dae <[email protected]>
+Isaac To <[email protected]> Isaac To <[email protected]>
+John Lee <[email protected]>
+John Lee <[email protected]> <[email protected]>
+John T. Wodder II <[email protected]> <[email protected]>
+Jörg Stadler <[email protected]> Joerg Stadler <[email protected]>
+Jörg Stadler <[email protected]> Joerg Stadler <[email protected]>
+Jörg Stadler <[email protected]> Jörg Stadler <[email protected]>
+Jörg Stadler <[email protected]> Jörg Stadler <[email protected]>
+Mathias Goncalves <[email protected]> mathiasg <[email protected]>
+Mathias Goncalves <[email protected]> mathiasg <[email protected]>
+Mathias Goncalves <[email protected]> Mathias Goncalves <[email protected]>
+Mathias Goncalves <[email protected]> Mathias Goncalves <[email protected]>
+Matteo Visconti di Oleggio Castello <[email protected]> Matteo Visconti dOC <[email protected]>
+Matteo Visconti di Oleggio Castello <[email protected]> Matteo Visconti dOC <[email protected]>
+Matteo Visconti di Oleggio Castello <[email protected]> <[email protected]>
+Michael Dayan <[email protected]> <[email protected]>
+Michael Krause <[email protected]> <[email protected]>
+Pablo Velasco <[email protected]> <[email protected]>
+Pablo Velasco <[email protected]> pvelasco <[email protected]>
+Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
+Steven Tilley <[email protected]> Steven Tilley <[email protected]>
+Steven Tilley <[email protected]> Steven Tilley <[email protected]>

.pre-commit-config.yaml

@@ -0,0 +1,34 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-json
+      - id: check-toml
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.4
+    hooks:
+      - id: codespell
+
+  - repo: https://github.com/psf/black
+    rev: 23.3.0
+    hooks:
+      - id: black
+
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
+    hooks:
+      - id: flake8
+        additional_dependencies:
+          - flake8-bugbear
+          - flake8-builtins
+          - flake8-unused-arguments

.readthedocs.yaml

@@ -8,7 +8,7 @@ python:
 build:
   os: ubuntu-20.04
   tools:
-    python: "3"
+    python: "3.9"
 sphinx:
   configuration: docs/conf.py
   fail_on_warning: true