Skip to content

Commit 516d9bc

Browse files
authored
fix: show tags (#1058)
* fix: show tags in listing Signed-off-by: Henry Schreiner <henryfs@princeton.edu> * refactor: simply a bit Signed-off-by: Henry Schreiner <henryfs@princeton.edu> * tests: update for tags Signed-off-by: Henry Schreiner <henryfs@princeton.edu> --------- Signed-off-by: Henry Schreiner <henryfs@princeton.edu>
1 parent 7207b3f commit 516d9bc

File tree

2 files changed

+21
-27
lines changed

2 files changed

+21
-27
lines changed

nox/tasks.py

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -273,28 +273,19 @@ def _produce_listing(manifest: Manifest, global_config: Namespace) -> None:
273273
skipped_color = parse_colors("white") if global_config.color else ""
274274

275275
for session, selected in manifest.list_all_sessions():
276-
output = "{marker} {color}{session}{reset}"
277-
278-
if selected:
279-
marker = "*"
280-
color = selected_color
281-
else:
282-
marker = "-"
283-
color = skipped_color
284-
285-
if session.description is not None:
286-
output += " -> {description}"
287-
288-
print(
289-
output.format(
290-
color=color,
291-
reset=reset,
292-
session=session.friendly_name,
293-
description=session.description,
294-
marker=marker,
295-
)
276+
marker = "*" if selected else "-"
277+
color = selected_color if selected else skipped_color
278+
tag_color = (
279+
(parse_colors("purple") if selected else parse_colors("light_purple"))
280+
if global_config.color
281+
else ""
296282
)
297283

284+
tags = f" {tag_color}[{','.join(session.tags)}]{reset}" if session.tags else ""
285+
description = f" -> {session.description}" if session.description else ""
286+
287+
print(f"{marker} {color}{session.friendly_name}{reset}{tags}{description}")
288+
298289
print(
299290
f"\nsessions marked with {selected_color}*{reset} are selected, sessions marked"
300291
f" with {skipped_color}-{reset} are skipped."

tests/test_tasks.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,10 @@ def test_honor_list_request(
451451
manifest = mock.create_autospec(Manifest)
452452
manifest.module_docstring = module_docstring
453453
manifest.list_all_sessions.return_value = [
454-
(argparse.Namespace(friendly_name="foo", description=description), True)
454+
(
455+
argparse.Namespace(friendly_name="foo", description=description, tags=[]),
456+
True,
457+
)
455458
]
456459
return_value = tasks.honor_list_request(manifest, global_config=config)
457460
assert return_value == 0
@@ -466,8 +469,8 @@ def test_honor_list_request_skip_and_selected(
466469
manifest = mock.create_autospec(Manifest)
467470
manifest.module_docstring = None
468471
manifest.list_all_sessions.return_value = [
469-
(argparse.Namespace(friendly_name="foo", description=None), True),
470-
(argparse.Namespace(friendly_name="bar", description=None), False),
472+
(argparse.Namespace(friendly_name="foo", description=None, tags=[]), True),
473+
(argparse.Namespace(friendly_name="bar", description=None, tags=[]), False),
471474
]
472475
return_value = tasks.honor_list_request(manifest, global_config=config)
473476
assert return_value == 0
@@ -487,8 +490,8 @@ def test_honor_list_request_prints_docstring_if_present(
487490
manifest = mock.create_autospec(Manifest)
488491
manifest.module_docstring = "Hello I'm a docstring"
489492
manifest.list_all_sessions.return_value = [
490-
(argparse.Namespace(friendly_name="foo", description=None), True),
491-
(argparse.Namespace(friendly_name="bar", description=None), False),
493+
(argparse.Namespace(friendly_name="foo", description=None, tags=[]), True),
494+
(argparse.Namespace(friendly_name="bar", description=None, tags=[]), False),
492495
]
493496

494497
return_value = tasks.honor_list_request(manifest, global_config=config)
@@ -508,8 +511,8 @@ def test_honor_list_request_doesnt_print_docstring_if_not_present(
508511
manifest = mock.create_autospec(Manifest)
509512
manifest.module_docstring = None
510513
manifest.list_all_sessions.return_value = [
511-
(argparse.Namespace(friendly_name="foo", description=None), True),
512-
(argparse.Namespace(friendly_name="bar", description=None), False),
514+
(argparse.Namespace(friendly_name="foo", description=None, tags=[]), True),
515+
(argparse.Namespace(friendly_name="bar", description=None, tags=[]), False),
513516
]
514517

515518
return_value = tasks.honor_list_request(manifest, global_config=config)

0 commit comments

Comments
 (0)