diff --git a/website/build.py b/website/build.py index c5a7fe291e..86daa85a65 100755 --- a/website/build.py +++ b/website/build.py @@ -46,6 +46,7 @@ "Beautiful Soup": "beautifulsoup4", "Cacheops": "django-cacheops", "Chroma": "chromadb", + "Colour": "colour-science", "Coverage.py": "coverage", "Django AI Skills": "django-ai-plugins", "Django ORM": "django.db.models", @@ -340,8 +341,12 @@ def link_intro_picks(text: str, entry_names: Sequence[str]) -> str: for i, line in enumerate(lines): if not line.startswith("- "): break - situation, _, pick = line.rpartition(": ") - lines[i] = f"{situation}: {link_pick_names(pick, slugs_by_key)}" + # A line can pair several situations with their picks: "- Physical units: Pint; astronomy: Astropy" + segments = [] + for segment in line.split("; "): + situation, sep, pick = segment.rpartition(": ") + segments.append(f"{situation}{sep}{link_pick_names(pick, slugs_by_key)}" if sep else segment) + lines[i] = "; ".join(segments) return head + marker + "\n".join(lines) diff --git a/website/tests/test_build.py b/website/tests/test_build.py index 2ecdc1662f..85183dcbf6 100644 --- a/website/tests/test_build.py +++ b/website/tests/test_build.py @@ -1645,3 +1645,16 @@ def test_links_pick_aliases_to_entry_rows(self, tmp_path): path.write_text("Use w1.\n\nHow to choose:\n\n- Vision: OpenCV\n", encoding="utf-8") intro_html, _, _, _ = load_category_intro(path, ["opencv-python"]) assert '
  • Vision: OpenCV
  • ' in intro_html + + def test_links_every_pick_on_a_line_pairing_several_situations(self, tmp_path): + path = tmp_path / "widgets.md" + path.write_text("Use w1.\n\nHow to choose:\n\n- Physical units: Pint; astronomy: Astropy; seismology: ObsPy\n- Colour science: Colour; math animations: Manim\n", encoding="utf-8") + intro_html, _, _, _ = load_category_intro(path, ["pint", "astropy", "obspy", "colour-science", "manim"]) + assert '
  • Physical units: Pint; astronomy: Astropy; seismology: ObsPy
  • ' in intro_html + assert '
  • Colour science: Colour; math animations: Manim
  • ' in intro_html + + def test_leaves_a_pick_line_without_a_situation_unchanged(self, tmp_path): + path = tmp_path / "widgets.md" + path.write_text("Use w1.\n\nHow to choose:\n\n- Django for everything\n", encoding="utf-8") + intro_html, _, _, _ = load_category_intro(path, ["Django"]) + assert "
  • Django for everything
  • " in intro_html