Two graphs

python · nedbat · Mar 19, 2025 · Mar 12, 2025 · Mar 13, 2025 · Mar 13, 2025
commit dc4f2792b0813df3af3949ff3506f5f5be380a2e
diff --git a/.gitignore b/.gitignore
@@ -91,3 +91,4 @@ celerybeat-schedule
 include/branches.csv
 include/end-of-life.csv
 include/release-cycle.svg
+include/release-cycle-all.svg
diff --git a/Makefile b/Makefile
@@ -22,6 +22,7 @@ REQUIREMENTS = requirements.txt
 _ALL_SPHINX_OPTS = --jobs $(JOBS) $(SPHINXOPTS)
 _RELEASE_CYCLE   = include/branches.csv \
                   include/end-of-life.csv \
+                   include/release-cycle-all.svg \
                   include/release-cycle.svg

 .PHONY: help

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) -> None:
+    def __init__(self, limit_to_active=False) -> None:
        with open("include/release-cycle.json", encoding="UTF-8") as in_file:
            self.versions = json.load(in_file)

@@ -38,6 +38,20 @@ def __init__(self) -> None:
            version["first_release_date"] = r1 = parse_date(version["first_release"])
            version["start_security_date"] = r1 + dt.timedelta(days=2 * 365)
            version["end_of_life_date"] = parse_date(version["end_of_life"])
+
+        if limit_to_active:
+            cutoff = min(
+                version["first_release_date"]
+                for version in self.versions.values()
+                if version["status"] != 'end-of-life'
+            )
+            self.versions = {
+                key: version
+                for key, version in self.versions.items()
+                if version["end_of_life_date"] >= cutoff
+            }
+
+
        self.sorted_versions = sorted(
            self.versions.values(),
            key=lambda v: [int(i) for i in v["key"].split(".")],
@@ -69,7 +83,7 @@ def write_csv(self) -> None:
                csv_file.writeheader()
                csv_file.writerows(versions.values())

-    def write_svg(self, today: str) -> None:
+    def write_svg(self, today: str, out_path: str) -> None:
        """Output SVG file."""
        env = jinja2.Environment(
            loader=jinja2.FileSystemLoader("_tools/"),
@@ -117,7 +131,7 @@ def format_year(year: int) -> str:
            return f"'{year % 100:02}"

        with open(
-            "include/release-cycle.svg", "w", encoding="UTF-8", newline="\n"
+            out_path, "w", encoding="UTF-8", newline="\n"
        ) as f:
            template.stream(
                SCALE=SCALE,
@@ -146,8 +160,13 @@ def main() -> None:
    args = parser.parse_args()

    versions = Versions()
+    print(versions.versions.keys())
+    assert len(versions.versions) > 10
    versions.write_csv()
-    versions.write_svg(args.today)
+    versions.write_svg(args.today, "include/release-cycle-all.svg")
+
+    versions = Versions(limit_to_active=True)
+    versions.write_svg(args.today, "include/release-cycle.svg")


 if __name__ == "__main__":

diff --git a/make.ps1 b/make.ps1
@@ -64,7 +64,8 @@ if ($target -Eq "clean") {
    $ToClean = @(
        $BUILDDIR,
        $_VENV_DIR,
-        "include/branches.csv", "include/end-of-life.csv", "include/release-cycle.svg"
+        "include/branches.csv", "include/end-of-life.csv",
+        "include/release-cycle.svg",  "include/release-cycle-all.svg"
    )
    foreach ($item in $ToClean) {
        if (Test-Path -Path $item) {

diff --git a/versions.rst b/versions.rst
@@ -10,13 +10,12 @@ branch that accepts new features.  The latest release for each Python
 version can be found on the `download page <https://www.python.org/downloads/>`_.


-Python release cycle
-====================
-
 .. raw:: html
   :file: include/release-cycle.svg

-Another useful visualization is `endoflife.date/python <https://endoflife.date/python>`_.
+(See :ref:`below <versions-chart-all>` for a chart with older versions.
+Another useful visualization is `endoflife.date/python <https://endoflife.date/python>`_.)
+

 Supported versions
 ==================
@@ -40,6 +39,15 @@ Unsupported versions
   :file: include/end-of-life.csv


+.. _versions-chart-all:
+
+Full chart
+==========
+
+.. raw:: html
+   :file: include/release-cycle-all.svg
+
+
 Status key
 ==========
-Original file line number
+Diff line change
@@ -10,13 +10,12 @@ branch that accepts new features.  The latest release for each Python
     version can be found on the `download page <https://www.python.org/downloads/>`_.
-    Python release cycle
-    ====================
     .. raw:: html
        :file: include/release-cycle.svg
-    Another useful visualization is `endoflife.date/python <https://endoflife.date/python>`_.
+    (See :ref:`below <versions-chart-all>` for a chart with older versions.
                   nedbat marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
+    Another useful visualization is `endoflife.date/python <https://endoflife.date/python>`_.)
     Supported versions
     ==================
@@ -40,6 +39,15 @@ Unsupported versions
        :file: include/end-of-life.csv
+    .. _versions-chart-all:
+    Full chart
+    ==========
+    .. raw:: html
+       :file: include/release-cycle-all.svg
       Comment on lines

    
      +44
     to 
      +48
    

  

  



  
    
        
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            ezio-melotti
  

      

      

      


        Mar 18, 2025


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I find the page structure a bit confusing, since it has two charts and two tables, with some level of overlapping between them but otherwise no further symmetry:

first there's the chart with 2.7 + 3.6-3.14
then there's a table with 3.9-3.14 (supported versions)
then there's another table with 2.6-2.7 + 3.0-3.8 (unsupported versions)
then there's the full chart with 2.6-2.7 + 3.0-3.14 (all versions)

In particular:

Is there a reason why the first chart includes 2.7/3.6-3.8 even though they are unsupported?  Perhaps this could become the chart of supported versions only?
It might be less confusing if both tables were under the same header ("Version support"?), with either a <caption> or a colspanning <th> on top of each table for "supported"/"unsupported" (or even joined together, with the colspanning <th>s)

This can also be addressed in a separate PR if you prefer.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



    
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            encukou
  

      

      

      


        Mar 18, 2025


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      This structure is deliberate. It keeps the tables together, and the least-useful info (the full chart) at the end, and a heavy distinction between active and EOL branches.

Perhaps this could become the chart of supported versions only?

When we get tired of telling people that 2.7 is EOL, we set the special_py27 argument to False :)

That'll still show versions that went EOL during an active branch's lifetime. That should (for 3.8+) match the recommended deprecation period per PEP 387.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



    
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            ezio-melotti
  

      

      

      


        Mar 21, 2025


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      
It keeps the tables together

This is good, since they complement each other -- that's why I suggested putting them in the same subsection too.

the least-useful info (the full chart) at the end, and a heavy distinction between active and EOL branches.

Removing EOL branches from the first chart would make the distinction even clearer IMHO.

When we get tired of telling people that 2.7 is EOL

I don't think we need it in the first chart for that -- the fact that it's not even included should give them a hint, and if that's not enough they can find 2.7 in the table and in the full chart.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
     Status key
     ==========
-          Expand Down