Skip to content

Commit 56cbb5c

Browse files
committed
Merge remote-tracking branch 'upstream/master' into cifti-combos
2 parents b7faf19 + 72327c5 commit 56cbb5c

File tree

109 files changed

+5309
-7314
lines changed

Some content is hidden

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

109 files changed

+5309
-7314
lines changed

.circleci/config.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,26 +120,25 @@ jobs:
120120

121121
get_data:
122122
docker:
123-
- image: continuumio/miniconda3:4.9.2-alpine
123+
- image: quay.io/condaforge/miniforge3:24.9.0-0
124124
working_directory: /tmp/data
125125
environment:
126126
- TEMPLATEFLOW_HOME: /tmp/templateflow
127127
steps:
128128
- restore_cache:
129129
keys:
130-
- env-v2-{{ .Branch }}-
131-
- env-v2-master-
132-
- env-v2-
130+
- env-v0-{{ .Branch }}-
131+
- env-v0-master-
132+
- env-v0-
133133
- run:
134134
name: Setup git-annex, DataLad & TemplateFlow
135135
command: |
136-
apk update && apk add --no-cache coreutils
137-
conda install -y -c conda-forge python=*=*cpython datalad git wget
138-
python -m pip install --no-cache-dir -U datalad-osf templateflow
136+
mamba install -y python=*=*cpython git-annex=*=alldep* unzip
137+
python -m pip install --no-cache-dir -U datalad datalad-osf templateflow
139138
git config --global user.name 'NiPreps Bot'
140139
git config --global user.email '[email protected]'
141140
- save_cache:
142-
key: env-v2-{{ .Branch }}-{{ .BuildNum }}
141+
key: env-v0-{{ .Branch }}-{{ .BuildNum }}
143142
paths:
144143
- /opt/conda
145144

.codespellrc

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

.flake8

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

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# 2025-01-09 - [email protected] - STY: Ruff format [git-blame-ignore-rev]
2+
75136b2bb86426c22609449b3f48579ee9c2e4f5

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ updates:
55
directory: "/"
66
schedule:
77
interval: "weekly"
8+
groups:
9+
actions-infrastructure:
10+
patterns:
11+
- "actions/*"

.github/workflows/pythonpackage.yml

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

0 commit comments

Comments
 (0)