Skip to content

Commit 4081ba8

Browse files
committed
STY: Mass ruff-ication
1 parent edbd316 commit 4081ba8

23 files changed

+414
-606
lines changed

get_version.py

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

nibabies/__about__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
try:
66
from ._version import __version__
77
except ImportError:
8-
__version__ = "0+unknown"
8+
__version__ = '0+unknown'
99

10-
__org__ = "nipreps"
11-
__packagename__ = "nibabies"
12-
__copyright__ = "Copyright 2023, Center for Reproducible Neuroscience, Stanford University"
10+
__org__ = 'nipreps'
11+
__packagename__ = 'nibabies'
12+
__copyright__ = 'Copyright 2023, Center for Reproducible Neuroscience, Stanford University'
1313
__credits__ = (
14-
"Contributors: please check the ``.zenodo.json`` file at the top-level folder"
15-
"of the repository"
14+
'Contributors: please check the ``.zenodo.json`` file at the top-level folder'
15+
'of the repository'
1616
)
17-
__url__ = f"https://github.com/{__org__}/{__packagename__}"
17+
__url__ = f'https://github.com/{__org__}/{__packagename__}'
1818

19-
DOWNLOAD_URL = f"https://github.com/{__org__}/{__packagename__}/archive/{__version__}.tar.gz"
19+
DOWNLOAD_URL = f'https://github.com/{__org__}/{__packagename__}/archive/{__version__}.tar.gz'

nibabies/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from .__about__ import __version__
1+
from .__about__ import __version__ # noqa: F401

nibabies/_warnings.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
import logging
44
import warnings
55

6-
_wlog = logging.getLogger("py.warnings")
6+
_wlog = logging.getLogger('py.warnings')
77
_wlog.addHandler(logging.NullHandler())
88

99

1010
def _warn(message, category=None, stacklevel=1, source=None):
1111
"""Redefine the warning function."""
1212
if category is not None:
1313
category = type(category).__name__
14-
category = category.replace("type", "WARNING")
14+
category = category.replace('type', 'WARNING')
1515

16-
logging.getLogger("py.warnings").warning(f"{category or 'WARNING'}: {message}")
16+
logging.getLogger('py.warnings').warning(f"{category or 'WARNING'}: {message}")
1717

1818

1919
def _showwarning(message, category, filename, lineno, file=None, line=None):

nibabies/cli/mcribs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
def _parser():
11-
parser = ArgumentParser(description="Test script for MCRIBS surfaces")
11+
parser = ArgumentParser(description='Test script for MCRIBS surfaces')
1212
parser.add_argument('subject', help='Subject ID')
1313
parser.add_argument('t2w', type=os.path.abspath, help='Input T2w (radioisotropic)')
1414
parser.add_argument(

nibabies/cli/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def main():
8585

8686
config.loggers.workflow.log(
8787
15,
88-
'\n'.join(['nibabies config:'] + ['\t\t%s' % s for s in config.dumps().splitlines()]),
88+
'\n'.join(['nibabies config:'] + [f'\t\t{s}' for s in config.dumps().splitlines()]),
8989
)
9090
config.loggers.workflow.log(25, 'nibabies started!')
9191

nibabies/cli/version.py

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
# vi: set ft=python sts=4 ts=4 sw=4 et:
33
"""Version CLI helpers."""
44

5-
from datetime import datetime
5+
from contextlib import suppress
6+
from datetime import datetime, timezone
67
from pathlib import Path
78

89
import requests
910

1011
from .. import __version__
1112

1213
RELEASE_EXPIRY_DAYS = 14
13-
DATE_FMT = "%Y%m%d"
14+
DATE_FMT = '%Y%m%d'
1415

1516

1617
def check_latest():
@@ -20,65 +21,62 @@ def check_latest():
2021
latest = None
2122
date = None
2223
outdated = None
23-
cachefile = Path.home() / ".cache" / "nibabies" / "latest"
24+
now = datetime.now(tz=timezone.utc)
25+
cachefile = Path.home() / '.cache' / 'nibabies' / 'latest'
2426
try:
2527
cachefile.parent.mkdir(parents=True, exist_ok=True)
2628
except OSError:
2729
cachefile = None
2830

2931
if cachefile and cachefile.exists():
3032
try:
31-
latest, date = cachefile.read_text().split("|")
32-
except Exception:
33+
latest, date = cachefile.read_text().split('|')
34+
except Exception: # noqa: S110, BLE001
3335
pass
3436
else:
3537
try:
3638
latest = Version(latest)
37-
date = datetime.strptime(date, DATE_FMT)
39+
date = datetime.strptime(date, DATE_FMT).astimezone(timezone.utc)
3840
except (InvalidVersion, ValueError):
3941
latest = None
4042
else:
41-
if abs((datetime.now() - date).days) > RELEASE_EXPIRY_DAYS:
43+
if abs((now - date).days) > RELEASE_EXPIRY_DAYS:
4244
outdated = True
4345

4446
if latest is None or outdated is True:
45-
try:
46-
response = requests.get(url="https://pypi.org/pypi/nibabies/json", timeout=1.0)
47-
except Exception:
48-
response = None
47+
response = None
48+
with suppress(Exception):
49+
response = requests.get(url='https://pypi.org/pypi/nibabies/json', timeout=1.0)
4950

5051
if response and response.status_code == 200:
51-
versions = [Version(rel) for rel in response.json()["releases"].keys()]
52+
versions = [Version(rel) for rel in response.json()['releases'].keys()]
5253
versions = [rel for rel in versions if not rel.is_prerelease]
5354
if versions:
5455
latest = sorted(versions)[-1]
5556
else:
5657
latest = None
5758

5859
if cachefile is not None and latest is not None:
59-
try:
60-
cachefile.write_text("|".join(("%s" % latest, datetime.now().strftime(DATE_FMT))))
61-
except Exception:
62-
pass
60+
with suppress(OSError):
61+
cachefile.write_text(f'{latest}|{now.strftime(DATE_FMT)}')
6362

6463
return latest
6564

6665

6766
def is_flagged():
6867
"""Check whether current version is flagged."""
6968
# https://raw.githubusercontent.com/nipreps/fmriprep/master/.versions.json
70-
flagged = tuple()
71-
try:
69+
flagged = ()
70+
response = None
71+
with suppress(Exception):
7272
response = requests.get(
7373
url="""\
7474
https://raw.githubusercontent.com/nipreps/nibabies/master/.versions.json""",
7575
timeout=1.0,
7676
)
77-
except Exception:
78-
response = None
7977

8078
if response and response.status_code == 200:
81-
flagged = response.json().get("flagged", {}) or {}
79+
flagged = response.json().get('flagged', {}) or {}
8280

8381
if __version__ in flagged:
8482
return True, flagged[__version__]

nibabies/conftest.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@
88
from nibabies.data import load as load_data
99

1010
FILES = (
11-
"functional.nii",
12-
"anatomical.nii",
13-
"func.dlabel.nii",
14-
"func.dtseries.nii",
15-
"epi.nii",
16-
"T1w.nii",
17-
"func_to_struct.mat",
18-
"atlas.nii",
19-
"label_list.txt",
20-
"sub-01_run-01_echo-1_bold.nii.gz",
21-
"sub-01_run-01_echo-2_bold.nii.gz",
22-
"sub-01_run-01_echo-3_bold.nii.gz",
11+
'functional.nii',
12+
'anatomical.nii',
13+
'func.dlabel.nii',
14+
'func.dtseries.nii',
15+
'epi.nii',
16+
'T1w.nii',
17+
'func_to_struct.mat',
18+
'atlas.nii',
19+
'label_list.txt',
20+
'sub-01_run-01_echo-1_bold.nii.gz',
21+
'sub-01_run-01_echo-2_bold.nii.gz',
22+
'sub-01_run-01_echo-3_bold.nii.gz',
2323
)
2424

2525

26-
@pytest.fixture(scope="package")
26+
@pytest.fixture(scope='package')
2727
def data_dir():
2828
with TemporaryDirectory() as tmpdir:
2929
tmp_path = Path(tmpdir)
@@ -33,7 +33,7 @@ def data_dir():
3333

3434

3535
@pytest.fixture(autouse=True)
36-
def set_namespace(doctest_namespace, data_dir):
37-
doctest_namespace["data_dir"] = data_dir
38-
doctest_namespace["test_data"] = load_data.cached('../tests/data')
39-
doctest_namespace["Path"] = Path
36+
def _populate_namespace(doctest_namespace, data_dir):
37+
doctest_namespace['data_dir'] = data_dir
38+
doctest_namespace['test_data'] = load_data.cached('../tests/data')
39+
doctest_namespace['Path'] = Path

0 commit comments

Comments
 (0)