Merge "make sphinxext support eol tags"

openstack_releases/deliverable.py

@@ -62,6 +62,11 @@ def _safe_semver(v):
 def _version_sort_key(release):
     """Return a value we can compare for sorting.
     """
+    # NOTE(dhellmann): We want EOL tags to sort last. This assumes we
+    # won't have more than 1000 major releases of anything, and I
+    # surely hope that is a safe assumption.
+    if release['version'].endswith('-eol'):
+        return _safe_semver('1000.0.0')
     return _safe_semver(release['version'])
 
 

openstack_releases/sphinxext.py

@@ -215,7 +215,12 @@ class DeliverableDirectiveBase(rst.Directive):
             most_recent = []
             for deliv in deliverables:
                 earliest_version = deliv.earliest_release
-                recent_version = deliv.latest_release
+                # Determine the most recent release that is not an EOL
+                # tag.
+                for r in reversed(deliv.releases):
+                    if not r.is_eol:
+                        recent_version = r.version
+                        break
                 ref = ':ref:`%s-%s`' % (series, deliv.name)
                 release_notes = deliv.release_notes
                 if not release_notes: