Skip to content

Commit 9f6eb33

Browse files
committed
Merge tag '25.0.0'
25.0.0 (August 12, 2025) Minor release including updated templates. * FIX: Fix crash in templateflow get when matching one file (#140) * MAINT: Update Python support, datalad and git-annex deps (#143)
2 parents 6c7f5b3 + 33240f1 commit 9f6eb33

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

CHANGES.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
25.0.0 (August 12, 2025)
2+
========================
3+
Minor release including updated templates.
4+
5+
* FIX: Fix crash in templateflow get when matching one file (#140)
6+
* MAINT: Update Python support, datalad and git-annex deps (#143)
7+
18
24.2.2 (September 14, 2024)
29
===========================
310
Patch release containing one bugfix and updating the default skeleton.

docs/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424

2525
# The short X.Y version
2626
version = (
27-
__version__ if Version(release).public == release
28-
else f"dev ({release.partition('+')[0]})"
27+
__version__ if Version(release).public == release else f'dev ({release.partition("+")[0]})'
2928
)
3029

3130
# -- General configuration ---------------------------------------------------

templateflow/api.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,18 @@ def get(template, raise_empty=False, **kwargs):
176176
if not_fetched:
177177
msg = 'Could not fetch template files: {}.'.format(', '.join(not_fetched))
178178
if dl_missing and not TF_USE_DATALAD:
179-
msg += (
180-
f"""\
179+
msg += f"""\
181180
The $TEMPLATEFLOW_HOME folder {TF_LAYOUT.root} seems to contain an initiated DataLad \
182181
dataset, but the environment variable $TEMPLATEFLOW_USE_DATALAD is not \
183182
set or set to one of (false, off, 0). Please set $TEMPLATEFLOW_USE_DATALAD \
184183
on (possible values: true, on, 1)."""
185-
)
186184

187185
if s3_missing and TF_USE_DATALAD:
188-
msg += (
189-
f"""\
186+
msg += f"""\
190187
The $TEMPLATEFLOW_HOME folder {TF_LAYOUT.root} seems to contain an plain \
191188
dataset, but the environment variable $TEMPLATEFLOW_USE_DATALAD is \
192189
set to one of (true, on, 1). Please set $TEMPLATEFLOW_USE_DATALAD \
193190
off (possible values: false, off, 0)."""
194-
)
195191

196192
raise RuntimeError(msg)
197193

@@ -394,5 +390,5 @@ def _normalize_ext(value):
394390
return value
395391

396392
if isinstance(value, str):
397-
return f"{'' if value.startswith('.') else '.'}{value}"
393+
return f'{"" if value.startswith(".") else "."}{value}'
398394
return [_normalize_ext(v) for v in value]

templateflow/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def entity_opts():
6161
entities = json.loads(Path(load_data('conf/config.json')).read_text())['entities']
6262

6363
args = [
64-
(f"--{e['name']}", *ENTITY_SHORTHANDS.get(e['name'], ()))
64+
(f'--{e["name"]}', *ENTITY_SHORTHANDS.get(e['name'], ()))
6565
for e in entities
6666
if e['name'] not in ENTITY_EXCLUDE
6767
]

templateflow/tests/test_api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ def assert_same(self, other):
8585
assert self.citekey == other.citekey, 'Mismatched citekeys'
8686
for key in self.pairs.keys():
8787
assert key in other.pairs, f'Key ({key}) missing from other'
88-
assert (
89-
self.pairs[key] == other.pairs[key]
90-
), f'Key ({key}) mismatched\n\n{self.pairs[key]}\n\n{other.pairs[key]}'
88+
assert self.pairs[key] == other.pairs[key], (
89+
f'Key ({key}) mismatched\n\n{self.pairs[key]}\n\n{other.pairs[key]}'
90+
)
9191

9292
for key in other.pairs.keys():
9393
assert key in self.pairs, f'Key ({key}) missing from pairs'

0 commit comments

Comments
 (0)