Special-case 2.7

encukou · encukou · commit 2cc3a3517645 · 2025-03-13T14:26:01.000+01:00
diff --git a/_tools/generate_release_cycle.py b/_tools/generate_release_cycle.py
@@ -28,7 +28,7 @@ def parse_date(date_str: str) -> dt.date:
 class Versions:
     """For converting JSON to CSV and SVG."""
 
-    def __init__(self, limit_to_active=False) -> None:
+    def __init__(self, limit_to_active=False, special_py27=False) -> None:
         with open("include/release-cycle.json", encoding="UTF-8") as in_file:
             self.versions = json.load(in_file)
 
@@ -47,10 +47,13 @@ def __init__(self, limit_to_active=False) -> None:
                 for version in self.versions.values()
                 if version["status"] != 'end-of-life'
             )
+            if special_py27:
+                self.cutoff = min(self.cutoff, dt.date(2019, 8, 1))
             self.versions = {
                 key: version
                 for key, version in self.versions.items()
                 if version["end_of_life_date"] >= self.cutoff
+                or (special_py27 and key == '2.7')
             }
             self.id_key='active'
         else:
@@ -62,6 +65,15 @@ def __init__(self, limit_to_active=False) -> None:
             reverse=True,
         )
 
+        # Set the row (y-coordinate) for the chart, to allow a gap between 2.7
+        # and the rest
+        y = len(self.sorted_versions) + (1 if special_py27 else 0)
+        for version in self.sorted_versions:
+            if special_py27 and version["key"] == '2.7':
+                y -= 1
+            version["y"] = y
+            y -= 1
+
 
     def write_csv(self) -> None:
         """Output CSV files."""
@@ -139,7 +151,7 @@ def format_year(year: int) -> str:
             template.stream(
                 SCALE=SCALE,
                 diagram_width=DIAGRAM_WIDTH,
-                diagram_height=(len(self.sorted_versions) + 2) * LINE_HEIGHT,
+                diagram_height=(self.sorted_versions[0]["y"] + 2) * LINE_HEIGHT,
                 years=range(first_date.year, last_date.year + 1),
                 LINE_HEIGHT=LINE_HEIGHT,
                 LEGEND_WIDTH=LEGEND_WIDTH,
@@ -171,7 +183,7 @@ def main() -> None:
     versions.write_csv()
     versions.write_svg(args.today, "include/release-cycle-all.svg")
 
-    versions = Versions(limit_to_active=True)
+    versions = Versions(limit_to_active=True, special_py27=True)
     versions.write_svg(args.today, "include/release-cycle.svg")
 
 
diff --git a/_tools/release_cycle_template.svg.jinja b/_tools/release_cycle_template.svg.jinja
@@ -12,9 +12,9 @@
     </defs>
 
     {% for version in versions %}
-        {% set y = loop.index * LINE_HEIGHT %}
+        {% set y = version.y * LINE_HEIGHT %}
 
-        {% if loop.index % 2 %}
+        {% if version.y % 2 %}
             <!-- Row shading -->
             <rect
                 class="release-cycle-row-shade"
@@ -74,7 +74,7 @@
     </mask>
 
     {% for version in versions %}
-        {% set y = loop.index * LINE_HEIGHT %}
+        {% set y = version.y * LINE_HEIGHT %}
 
         <!-- Legend on the left -->
         <text
