Skip to content

Commit e8d111e

Browse files
committed
chore: replace %-formatting of strings with f-strings or format method
Fixes ruff UP301 errors.
1 parent f89760f commit e8d111e

File tree

7 files changed

+21
-18
lines changed

7 files changed

+21
-18
lines changed

src/taskgraph/generator.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,9 @@ def _run(self):
338338
all_tasks, Graph(frozenset(full_task_set.graph.nodes), frozenset(edges))
339339
)
340340
logger.info(
341-
"Full task graph contains %d tasks and %d dependencies"
342-
% (len(full_task_set.graph.nodes), len(edges))
341+
"Full task graph contains {} tasks and {} dependencies".format(
342+
len(full_task_set.graph.nodes), len(edges)
343+
)
343344
)
344345
yield self.verify("full_task_graph", full_task_graph, graph_config, parameters)
345346

@@ -356,8 +357,9 @@ def _run(self):
356357
Graph(frozenset(target_tasks), frozenset()),
357358
)
358359
logger.info(
359-
"Filter %s pruned %d tasks (%d remain)"
360-
% (fltr.__name__, old_len - len(target_tasks), len(target_tasks))
360+
"Filter {} pruned {} tasks ({} remain)".format(
361+
fltr.__name__, old_len - len(target_tasks), len(target_tasks)
362+
)
361363
)
362364

363365
yield self.verify("target_task_set", target_task_set, graph_config, parameters)
@@ -375,8 +377,9 @@ def _run(self):
375377
else:
376378
always_target_tasks = set()
377379
logger.info(
378-
"Adding %d tasks with `always_target` attribute"
379-
% (len(always_target_tasks) - len(always_target_tasks & target_tasks)) # type: ignore
380+
"Adding {} tasks with `always_target` attribute".format(
381+
(len(always_target_tasks) - len(always_target_tasks & target_tasks))
382+
)
380383
)
381384
requested_tasks = target_tasks | always_target_tasks # type: ignore
382385
target_graph = full_task_graph.graph.transitive_closure(requested_tasks)

src/taskgraph/transforms/fetch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,11 @@ def create_fetch_url_task(config, name, fetch):
231231
"--sha256",
232232
fetch["sha256"],
233233
"--size",
234-
"%d" % fetch["size"],
234+
f"{fetch['size']}",
235235
]
236236

237237
if fetch.get("strip-components"):
238-
args.extend(["--strip-components", "%d" % fetch["strip-components"]])
238+
args.extend(["--strip-components", f'{fetch["strip-components"]}'])
239239

240240
if fetch.get("add-prefix"):
241241
args.extend(["--add-prefix", fetch["add-prefix"]])

src/taskgraph/util/shell.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def _quote(s):
1515
not enclosed in quotes.
1616
"""
1717
if isinstance(s, int):
18-
return "%d" % s
18+
return f"{s}"
1919

2020
# Empty strings need to be quoted to have any significance
2121
if s and not SHELL_QUOTE_RE.search(s) and not s.startswith("~"):

test/test_optimize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ def test_get_subgraph(monkeypatch, graph, kwargs, exp_subgraph, exp_label_to_tas
454454
4. The expected label_to_taskid.
455455
"""
456456
monkeypatch.setattr(
457-
optimize_mod, "slugid", partial(next, ("tid%d" % i for i in range(1, 10)))
457+
optimize_mod, "slugid", partial(next, (f"tid{i}" for i in range(1, 10)))
458458
)
459459

460460
kwargs.setdefault("removed_tasks", set())

test/test_util_archive.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ class TestArchive(unittest.TestCase):
3838
def _create_files(self, root):
3939
files = {}
4040
for i in range(10):
41-
p = os.path.join(root, "file%02d" % i)
41+
p = os.path.join(root, f"file{i:02d}")
4242
with open(p, "wb") as fh:
4343
fh.write(b"file%02d" % i)
4444
# Need to set permissions or umask may influence testing.
4545
os.chmod(p, MODE_STANDARD)
46-
files["file%02d" % i] = p
46+
files[f"file{i:02d}"] = p
4747

4848
for i in range(10):
49-
files["file%02d" % (i + 10)] = io.BytesIO(b"file%02d" % (i + 10))
49+
files[f"file{i + 10:02d}"] = io.BytesIO(b"file%02d" % (i + 10))
5050

5151
return files
5252

5353
def _verify_basic_tarfile(self, tf):
5454
self.assertEqual(len(tf.getmembers()), 20)
5555

56-
names = ["file%02d" % i for i in range(20)]
56+
names = [f"file{i:02d}" for i in range(20)]
5757
self.assertEqual(tf.getnames(), names)
5858

5959
for ti in tf.getmembers():

test/test_util_docker.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def test_create_context_extra_directory(self):
204204
extra = os.path.join(tmp, "extra")
205205
os.mkdir(extra)
206206
for i in range(3):
207-
p = os.path.join(extra, "file%d" % i)
207+
p = os.path.join(extra, f"file{i}")
208208
with open(p, "wb") as fh:
209209
fh.write(b"file%d" % i)
210210
os.chmod(p, MODE_STANDARD)
@@ -249,7 +249,7 @@ def test_stream_context_tar(self):
249249
extra = os.path.join(tmp, "extra")
250250
os.mkdir(extra)
251251
for i in range(3):
252-
p = os.path.join(extra, "file%d" % i)
252+
p = os.path.join(extra, f"file{i}")
253253
with open(p, "wb") as fh:
254254
fh.write(b"file%d" % i)
255255
os.chmod(p, MODE_STANDARD)

test/test_util_parameterization.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_timestamps_appears_with_other_keys():
4242
@pytest.fixture
4343
def assert_task_refs():
4444
def inner(input, output):
45-
taskid_for_edge_name = {"edge%d" % n: "tid%d" % n for n in range(1, 4)}
45+
taskid_for_edge_name = {f"edge{n}": f"tid{n}" for n in range(1, 4)}
4646
assert (
4747
resolve_task_references(
4848
"subject",
@@ -151,7 +151,7 @@ def assert_artifact_refs(monkeypatch):
151151
def inner(input, output):
152152
# Clear memoized function
153153
get_root_url.cache_clear()
154-
taskid_for_edge_name = {"edge%d" % n: "tid%d" % n for n in range(1, 4)}
154+
taskid_for_edge_name = {f"edge{n}": f"tid{n}" for n in range(1, 4)}
155155
assert (
156156
resolve_task_references(
157157
"subject", input, "tid-self", "tid-decision", taskid_for_edge_name

0 commit comments

Comments
 (0)