hugovk · Feb 1, 2023 · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023 · Jan 22, 2023
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,11 @@
+# Generated files
+# https://github.com/github/linguist/blob/master/docs/overrides.md
+#
+# To always hide generated files in local diffs, mark them as binary:
+# $ git config diff.generated.binary true
+#
+[attr]generated linguist-generated=true diff=generated
+
+include/release-cycle.svg          generated
+include/branches.csv               generated
+include/end-of-life.csv            generated
diff --git a/.github/workflows/release-cycle.yml b/.github/workflows/release-cycle.yml
@@ -19,10 +19,17 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: "3"
+          cache: pip
+
+      - name: Install Jinja
+        run: python -m pip install jinja2
 
       - name: Generate release cycle output
         run: python -I -bb -X dev -X warn_default_encoding -W error _tools/generate_release_cycle.py
 
+      - name: Ignore release-cycle.svg, which encodes the current date
+        run: git restore include/release-cycle.svg
+
       - name: Check for differences
         run: |
           git add .

diff --git a/Makefile b/Makefile
@@ -194,9 +194,9 @@ include/branches.csv: include/release-cycle.json
 include/end-of-life.csv: include/release-cycle.json
 	$(PYTHON) _tools/generate_release_cycle.py
 
-include/release-cycle.mmd: include/release-cycle.json
+include/release-cycle.svg: include/release-cycle.json
 	$(PYTHON) _tools/generate_release_cycle.py
 
 .PHONY: versions
-versions: include/branches.csv include/end-of-life.csv include/release-cycle.mmd
+versions: include/branches.csv include/end-of-life.csv include/release-cycle.svg
 	@echo Release cycle data generated.
diff --git a/_static/devguide_overrides.css b/_static/devguide_overrides.css
@@ -7,66 +7,70 @@
 }
 
 /* Release cycle chart */
-#python-release-cycle .mermaid .active0,
-#python-release-cycle .mermaid .active1,
-#python-release-cycle .mermaid .active2,
-#python-release-cycle .mermaid .active3 {
-    fill: #00dd00;
-    stroke: darkgreen;
+
+.release-cycle-chart {
+    width: 100%;
+    /* filter: grayscale(100%); */
+}
+
+.release-cycle-chart .release-cycle-year-line {
+    stroke: var(--color-foreground-primary);
+    stroke-width: 0.8px;
+    opacity: 75%;
+}
+
+.release-cycle-chart .release-cycle-year-text {
+    fill: var(--color-foreground-primary);
+}
+
+.release-cycle-chart .release-cycle-today-line {
+    stroke: var(--color-brand-primary);
+    stroke-width: 1.6px;
 }
 
-#python-release-cycle .mermaid .done0,
-#python-release-cycle .mermaid .done1,
-#python-release-cycle .mermaid .done2,
-#python-release-cycle .mermaid .done3 {
-    fill: orange;
-    stroke: darkorange;
+.release-cycle-chart .release-cycle-row-shade {
+    fill: var(--color-background-item);
+    opacity: 50%;
 }
 
-#python-release-cycle .mermaid .task0,
-#python-release-cycle .mermaid .task1,
-#python-release-cycle .mermaid .task2,
-#python-release-cycle .mermaid .task3 {
-    fill: #007acc;
-    stroke: #004455;
+.release-cycle-chart .release-cycle-version-label {
+    fill: var(--color-foreground-primary);
 }
 
-#python-release-cycle .mermaid .section0,
-#python-release-cycle .mermaid .section2 {
-    fill: darkgrey;
+.release-cycle-chart .release-cycle-blob {
+    stroke-width: 1.6px;
+    /* default colours, overriden below for individual statuses */
+    fill: var(--color-background-primary);
+    stroke: var(--color-foreground-primary);
 }
 
-/* Set master colours */
-:root {
-    --mermaid-section1-3: white;
-    --mermaid-text-color: black;
+.release-cycle-chart .release-cycle-blob-label {
+    /* white looks good on both light & dark */
+    fill: white;
+    filter:
+        drop-shadow(1px 1px 0.5px rgba(0, 0, 0, 0.5))
+        drop-shadow(-1px 1px 0.5px rgba(0, 0, 0, 0.5))
+        drop-shadow(1px -1px 0.5px rgba(0, 0, 0, 0.5))
+        drop-shadow(-1px -1px 0.5px rgba(0, 0, 0, 0.5))
+        ;
 }
 
-@media (prefers-color-scheme: dark) {
-    body[data-theme=auto] {
-        --mermaid-section1-3: black;
-        --mermaid-text-color: #ffffffcc;
-    }
+.release-cycle-chart .release-cycle-blob-end-of-life {
+    fill: #DD2200;
+    stroke: #FF8888;
 }
-body[data-theme=dark] {
-    --mermaid-section1-3: black;
-    --mermaid-text-color: #ffffffcc;
+
+.release-cycle-chart .release-cycle-blob-security {
+    fill: #FFDD44;
+    stroke: #FF8800;
 }
 
-#python-release-cycle .mermaid .section1,
-#python-release-cycle .mermaid .section3 {
-    fill: var(--mermaid-section1-3);
+.release-cycle-chart .release-cycle-blob-bugfix {
+    fill: #00DD22;
+    stroke: #008844;
 }
 
-#python-release-cycle .mermaid .grid .tick text,
-#python-release-cycle .mermaid .sectionTitle0,
-#python-release-cycle .mermaid .sectionTitle1,
-#python-release-cycle .mermaid .sectionTitle2,
-#python-release-cycle .mermaid .sectionTitle3,
-#python-release-cycle .mermaid .taskTextOutside0,
-#python-release-cycle .mermaid .taskTextOutside1,
-#python-release-cycle .mermaid .taskTextOutside2,
-#python-release-cycle .mermaid .taskTextOutside3,
-#python-release-cycle .mermaid .titleText {
-    fill: var(--mermaid-text-color);
+.release-cycle-chart .release-cycle-blob-feature {
+    fill: #2222EE;
+    stroke: #008888;
 }
diff --git a/_tools/generate_release_cycle.py b/_tools/generate_release_cycle.py
@@ -1,28 +1,11 @@
-"""Read in a JSON and generate two CSVs and a Mermaid file."""
+"""Read in a JSON and generate two CSVs and a SVG file."""
 from __future__ import annotations
 
 import csv
 import datetime as dt
 import json
 
-MERMAID_HEADER = """
-gantt
-    dateFormat  YYYY-MM-DD
-    title       Python release cycle
-    axisFormat  %Y
-""".lstrip()
-
-MERMAID_SECTION = """
-    section Python {version}
-    {release_status}               :{mermaid_status}   python{version}, {first_release},{eol}
-"""  # noqa: E501
-
-MERMAID_STATUS_MAPPING = {
-    "feature": "",
-    "bugfix": "active,",
-    "security": "done,",
-    "end-of-life": "crit,",
-}
+import jinja2
 
 
 def csv_date(date_str: str, now_str: str) -> str:
@@ -32,24 +15,27 @@ def csv_date(date_str: str, now_str: str) -> str:
         return f"*{date_str}*"
     return date_str
 
-
-def mermaid_date(date_str: str) -> str:
-    """Format a date for Mermaid."""
+def parse_date(date_str: str) -> dt.date:
     if len(date_str) == len("yyyy-mm"):
-        # Mermaid needs a full yyyy-mm-dd, so let's approximate
-        date_str = f"{date_str}-01"
-    return date_str
-
+        # We need a full yyyy-mm-dd, so let's approximate
+        return dt.date.fromisoformat(date_str + '-01')
+    return dt.date.fromisoformat(date_str)
 
 class Versions:
-    """For converting JSON to CSV and Mermaid."""
+    """For converting JSON to CSV and SVG."""
 
     def __init__(self) -> None:
         with open("include/release-cycle.json", encoding="UTF-8") as in_file:
             self.versions = json.load(in_file)
+
+        # Generate a few additional fields
+        for key, version in self.versions.items():
+            version['key'] = key
+            version['first_release_date'] = parse_date(version['first_release'])
+            version['end_of_life_date'] = parse_date(version['end_of_life'])
         self.sorted_versions = sorted(
-            self.versions.items(),
-            key=lambda k: [int(i) for i in k[0].split(".")],
+            self.versions.values(),
+            key=lambda v: [int(i) for i in v['key'].split(".")],
             reverse=True,
         )
 
@@ -59,7 +45,7 @@ def write_csv(self) -> None:
 
         versions_by_category = {"branches": {}, "end-of-life": {}}
         headers = None
-        for version, details in self.sorted_versions:
+        for details in self.sorted_versions:
             row = {
                 "Branch": details["branch"],
                 "Schedule": f":pep:`{details['pep']}`",
@@ -70,38 +56,84 @@ def write_csv(self) -> None:
             }
             headers = row.keys()
             cat = "end-of-life" if details["status"] == "end-of-life" else "branches"
-            versions_by_category[cat][version] = row
+            versions_by_category[cat][details['key']] = row
 
         for cat, versions in versions_by_category.items():
             with open(f"include/{cat}.csv", "w", encoding="UTF-8", newline="") as file:
                 csv_file = csv.DictWriter(file, fieldnames=headers, lineterminator="\n")
                 csv_file.writeheader()
                 csv_file.writerows(versions.values())
 
-    def write_mermaid(self) -> None:
-        """Output Mermaid file."""
-        out = [MERMAID_HEADER]
+    def write_svg(self) -> None:
+        """Output SVG file."""
+        env = jinja2.Environment(
+            loader=jinja2.FileSystemLoader('_tools/'),
+            autoescape=True,
+            undefined=jinja2.StrictUndefined,
+        )
+        template = env.get_template("release_cycle_template.svg")
+
+        # Scale. Should be roughly the pixel size of the font.
+        # All later sizes are miltiplied by this, so you can think of all other
+        # numbers being multiples of the font size, like using `em` units in
+        # CSS.
+        # (Ideally we'd actually use `em` units, but SVG viewBox doesn't take
+        # those.)
+        SCALE = 18
+
+        # Width of the drawing and main parts
+        DIAGRAM_WIDTH = 46
+        LEGEND_WIDTH = 7
+        RIGHT_MARGIN = 0.5
+
+        # Height of one line. If you change this you'll need to tweak
+        # some positioning nombers in the template as well.
+        LINE_HEIGHT = 1.5
+
+        first_date = min(
+            ver['first_release_date'] for ver in self.sorted_versions
+        )
+        last_date = max(
+            ver['end_of_life_date'] for ver in self.sorted_versions
+        )
+
+        def date_to_x(date):
+            """Convert datetime.date to a SVG X coordinate"""
+            num_days = (date - first_date).days
+            total_days = (last_date - first_date).days
+            ratio = num_days / total_days
+            x = ratio * (DIAGRAM_WIDTH - LEGEND_WIDTH - RIGHT_MARGIN)
+            return x + LEGEND_WIDTH
+
+        def year_to_x(year):
+            """Convert year number to a SVG X coordinate of 1st January"""
+            return date_to_x(dt.date(year, 1, 1))
 
-        for version, details in reversed(self.versions.items()):
-            v = MERMAID_SECTION.format(
-                version=version,
-                first_release=details["first_release"],
-                eol=mermaid_date(details["end_of_life"]),
-                release_status=details["status"],
-                mermaid_status=MERMAID_STATUS_MAPPING[details["status"]],
-            )
-            out.append(v)
+        def format_year(year):
+            """Format year number for display"""
+            return f"'{year % 100:02}"
 
         with open(
-            "include/release-cycle.mmd", "w", encoding="UTF-8", newline="\n"
+            "include/release-cycle.svg", "w", encoding="UTF-8",
         ) as f:
-            f.writelines(out)
+            template.stream(
+                SCALE=SCALE,
+                diagram_width=DIAGRAM_WIDTH,
+                diagram_height=(len(self.sorted_versions) + 2) * LINE_HEIGHT,
+                years=range(first_date.year, last_date.year),
+                LINE_HEIGHT=LINE_HEIGHT,
+                versions=list(reversed(self.sorted_versions)),
+                today=dt.date.today(),
+                year_to_x=year_to_x,
+                date_to_x=date_to_x,
+                format_year=format_year,
+            ).dump(f)
 
 
 def main() -> None:
     versions = Versions()
     versions.write_csv()
-    versions.write_mermaid()
+    versions.write_svg()
 
 
 if __name__ == "__main__":