Skip to content

Commit 844b88d

Browse files
committed
Merge branch 'master' into jpeg2000
2 parents ecfebe5 + 5552416 commit 844b88d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+6339
-3776
lines changed

.codespellrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[codespell]
2+
skip = .git,.venv,venvs,*.svg,_build
3+
# te -- TE as codespell is case insensitive
4+
ignore-words-list = bu,nd,te

.coveragerc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.dockerignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- DO NOT DELETE THIS!
1+
<!-- DO NOT DELETE THIS!
22
This template is used to facilitate issue resolution.
33
All text in <!-> tags will not be displayed.
44
-->
@@ -20,5 +20,5 @@ Choose one:
2020
- [ ] Container
2121
<!-- If selected, please provide container name and tag"-->
2222

23-
- Heudiconv version:
23+
- Heudiconv version:
2424
<!-- To check: run heudiconv with just the --version flag -->

.github/workflows/codespell.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: Codespell
3+
4+
on:
5+
push:
6+
branches: [master]
7+
pull_request:
8+
branches: [master]
9+
10+
jobs:
11+
codespell:
12+
name: Check for spelling errors
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
- name: Codespell
19+
uses: codespell-project/actions-codespell@v2

.github/workflows/docker.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout source
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616

@@ -20,12 +20,22 @@ jobs:
2020
working-directory: utils
2121

2222
- name: Build Docker image
23-
run: docker build -t nipy/heudiconv:master .
23+
run: |
24+
# build only if not release tag, i.e. has some "-" in describe
25+
# so we do not duplicate work with release workflow.
26+
git describe --match 'v[0-9]*' | grep -q -e - && \
27+
docker build \
28+
-t nipy/heudiconv:master \
29+
-t nipy/heudiconv:unstable \
30+
.
2431
2532
- name: Push Docker image
2633
run: |
27-
docker login -u "$DOCKER_LOGIN" --password-stdin <<<"$DOCKER_TOKEN"
28-
docker push nipy/heudiconv:master
34+
git describe --match 'v[0-9]*' | grep -q -e - && (
35+
docker login -u "$DOCKER_LOGIN" --password-stdin <<<"$DOCKER_TOKEN"
36+
docker push nipy/heudiconv:master
37+
docker push nipy/heudiconv:unstable
38+
)
2939
env:
3040
DOCKER_LOGIN: ${{ secrets.DOCKER_LOGIN }}
3141
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}

.github/workflows/lint.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Linters
2+
3+
on:
4+
- push
5+
- pull_request
6+
7+
jobs:
8+
lint:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Set up environment
12+
uses: actions/checkout@v4
13+
with:
14+
fetch-depth: 0
15+
16+
- name: Set up Python
17+
uses: actions/setup-python@v4
18+
with:
19+
python-version: '3.7'
20+
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
python -m pip install --upgrade tox
25+
26+
- name: Run linters
27+
run: tox -e lint

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')"
1313
steps:
1414
- name: Checkout source
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
1818

@@ -67,8 +67,9 @@ jobs:
6767
run: |
6868
docker build \
6969
-t nipy/heudiconv:master \
70+
-t nipy/heudiconv:unstable \
7071
-t nipy/heudiconv:latest \
71-
-t nipy/heudiconv:"$(git describe)" \
72+
-t nipy/heudiconv:"$(git describe | sed -e 's,^v,,g')" \
7273
.
7374
7475
- name: Push Docker images

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ jobs:
1818
- '3.8'
1919
- '3.9'
2020
- '3.10'
21+
- '3.11'
2122
steps:
2223
- name: Check out repository
23-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2425
with:
2526
fetch-depth: 0
2627

.github/workflows/typing.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Type-check
2+
3+
on:
4+
- push
5+
- pull_request
6+
7+
jobs:
8+
typing:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Check out repository
12+
uses: actions/checkout@v4
13+
with:
14+
fetch-depth: 0
15+
16+
- name: Set up Python
17+
uses: actions/setup-python@v4
18+
with:
19+
python-version: '3.7'
20+
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
python -m pip install --upgrade tox
25+
26+
- name: Run type checker
27+
run: tox -e typing

0 commit comments

Comments
 (0)