Skip to content

Commit 1243cf3

Browse files
committed
sty: Reduce line expansion, remove unused Ruff config
1 parent 54f8545 commit 1243cf3

File tree

2 files changed

+7
-42
lines changed

2 files changed

+7
-42
lines changed

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,3 @@ extend-select = [
111111
"PERF",
112112
"RUF",
113113
]
114-
115-
[tool.ruff.lint.isort]
116-
known-first-party = ["nipreps_versions"]

tests/test_schemes.py

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,62 +15,32 @@
1515
[
1616
pytest.param(m("22.1.0"), "22.1.0", id="exact"),
1717
pytest.param(
18-
m(
19-
"22.1.0",
20-
node_date=date(2022, 12, 31),
21-
distance=1,
22-
branch="master",
23-
),
18+
m("22.1.0", node_date=date(2022, 12, 31), distance=1, branch="master"),
2419
"22.2.0.dev1",
2520
id="new_minor",
2621
),
2722
pytest.param(
28-
m(
29-
"22.1.0",
30-
node_date=date(2023, 1, 1),
31-
distance=1,
32-
branch="master",
33-
),
23+
m("22.1.0", node_date=date(2023, 1, 1), distance=1, branch="master"),
3424
"23.0.0.dev1",
3525
id="new_year",
3626
),
3727
pytest.param(
38-
m(
39-
"22.1.0",
40-
node_date=date(2023, 2, 1),
41-
distance=1,
42-
branch="rel/22.1.1",
43-
),
28+
m("22.1.0", node_date=date(2023, 2, 1), distance=1, branch="rel/22.1.1"),
4429
"22.1.1.dev1",
4530
id="patch_release",
4631
),
4732
pytest.param(
48-
m(
49-
"22.1.0",
50-
node_date=date(2022, 12, 31),
51-
distance=1,
52-
branch="rel/22.2.0",
53-
),
33+
m("22.1.0", node_date=date(2022, 12, 31), distance=1, branch="rel/22.2.0"),
5434
"22.2.0.dev1",
5535
id="minor_release",
5636
),
5737
pytest.param(
58-
m(
59-
"22.1.0",
60-
node_date=date(2023, 3, 31),
61-
distance=1,
62-
branch="maint/22.1.x",
63-
),
38+
m("22.1.0", node_date=date(2023, 3, 31), distance=1, branch="maint/22.1.x"),
6439
"22.1.1.dev1",
6540
id="maintenance_branch",
6641
),
6742
pytest.param(
68-
m(
69-
"23.0.0.dev0",
70-
node_date=date(2022, 12, 31),
71-
distance=1,
72-
branch="master",
73-
),
43+
m("23.0.0.dev0", node_date=date(2022, 12, 31), distance=1, branch="master"),
7444
"23.0.0.dev1",
7545
id="dev_tag",
7646
),
@@ -83,8 +53,6 @@ def test_nipreps_calver(version: ScmVersion, expected_next: str) -> None:
8353
def test_next_calver() -> None:
8454
# Omit optional arguments always passed by nipreps_calver
8555
assert (
86-
next_calver(
87-
m("1.0.0", distance=1, branch="master"),
88-
)
56+
next_calver(m("1.0.0", distance=1, branch="master"))
8957
== f"{datetime.now(timezone.utc):%y}.0.0"
9058
)

0 commit comments

Comments
 (0)