Hide eol distros

macro/PackageHeader.py

@@ -1,20 +1,12 @@
 from MoinMoin.Page import Page
 from MoinMoin.wikiutil import get_unicode
 
-from macroutils import load_package_manifest, distro_names, CONTRIBUTE_TMPL, UtilException
+from macroutils import load_package_manifest, distro_names, distro_names_buildfarm, CONTRIBUTE_TMPL, UtilException
 from headers import get_nav, get_description, get_package_links, generate_package_header, distro_html, doc_html, get_loaded_distros
 
 generates_headings = True
 dependencies = []
 
-if 'boxturtle' in distro_names:
-    distro_names.remove('boxturtle')
-if 'cturtle' in distro_names:
-    distro_names.remove('cturtle')
-if 'diamondback' in distro_names:
-    distro_names.remove('diamondback')
-if 'unstable' in distro_names:
-    distro_names.remove('unstable')
 
 def generate_old_package_header(macro, package_name, opt_distro=None):
     if not package_name:
@@ -28,7 +20,7 @@ def generate_old_package_header(macro, package_name, opt_distro=None):
 
     try:
         data = load_package_manifest(package_name, opt_distro)
-    except UtilException, e:
+    except UtilException as e:
         name = "name: %s, distro: %s" % (package_name, opt_distro)
         return CONTRIBUTE_TMPL%locals()
 
@@ -44,18 +36,18 @@ def macro_PackageHeader(macro, arg1, arg2=None):
     opt_distro = get_unicode(macro.request, arg2)
     if not opt_distro:
         headers_html = []
-        loaded_distros = get_loaded_distros(package_name, distro_names)
-        for distro in distro_names:
+        loaded_distros = get_loaded_distros(package_name, distro_names_buildfarm)
+        for distro in loaded_distros:
             if distro in ['boxturtle', 'cturtle', 'diamondback']:
                 pkg_header_html = generate_old_package_header(macro, package_name, distro)
             else:
                 pkg_header_html = generate_package_header(macro, package_name, distro)
             headers_html.append('<div class="version %s">' % distro + pkg_header_html + '</div>')
 
         html = '<span id="rosversion_selector" class="btn-group">\n'
-        html += "\n".join([distro_html(distro, loaded_distros) for distro in distro_names])
+        html += "\n".join([distro_html(distro, loaded_distros) for distro in loaded_distros])
         html += '\n</span>'
-        html += doc_html(distro_names, package_name)
+        html += doc_html(distro_names_buildfarm, package_name)
         return macro.formatter.rawHTML(html + "\n".join(headers_html))
     else:
         if opt_distro in ['boxturtle', 'cturtle', 'diamondback']:

macro/StackHeader.py

@@ -2,25 +2,17 @@
 from MoinMoin.Page import Page
 from MoinMoin.wikiutil import get_unicode
 
-from macroutils import load_stack_manifest, load_package_manifest, distro_names, CONTRIBUTE_TMPL, UtilException
+from macroutils import load_stack_manifest, load_package_manifest, distro_names, distro_names_buildfarm, CONTRIBUTE_TMPL, UtilException
 from headers import get_nav, get_description, get_package_links, generate_package_header, distro_html, get_stack_links, doc_html, get_loaded_distros
 
 generates_headings = True
 dependencies = []
 
-if 'boxturtle' in distro_names:
-    distro_names.remove('boxturtle')
-if 'cturtle' in distro_names:
-    distro_names.remove('cturtle')
-if 'diamondback' in distro_names:
-    distro_names.remove('diamondback')
-if 'unstable' in distro_names:
-    distro_names.remove('unstable')
 
 def generate_old_stack_header(macro, stack_name, opt_distro=None):
     try:
         data = load_stack_manifest(stack_name, opt_distro)
-    except UtilException, e:
+    except UtilException as e:
         name = "name: %s, distro: %s" % (stack_name, opt_distro)
         return CONTRIBUTE_TMPL%locals()
 
@@ -54,23 +46,21 @@ def macro_StackHeader(macro, arg1, arg2=None):
 
     if not opt_distro:
         headers_html = []
-        loaded_distros = get_loaded_distros(stack_name, distro_names)
-        for distro in distro_names:
+        loaded_distros = get_loaded_distros(stack_name, distro_names_buildfarm)
+        for distro in loaded_distros:
             if distro in ['boxturtle', 'cturtle', 'diamondback']:
                 stack_header_html = generate_old_stack_header(macro, stack_name, distro)
             else:
                 stack_header_html = generate_package_header(macro, stack_name, distro)
             headers_html.append('<div class="version %s">' % distro + stack_header_html + '</div>')
 
         html = '<span id="rosversion_selector" class="btn-group">\n'
-        html += "\n".join([distro_html(distro, loaded_distros) for distro in distro_names])
+        html += "\n".join([distro_html(distro, loaded_distros) for distro in loaded_distros])
         html += '\n</span>'
-        html += doc_html(distro_names, stack_name)
+        html += doc_html(distro_names_buildfarm, stack_name)
         return macro.formatter.rawHTML(html + "\n".join(headers_html))
     else:
         if opt_distro in ['boxturtle', 'cturtle', 'diamondback']:
             return generate_old_stack_header(macro, stack_name, opt_distro)
         else:
             return generate_package_header(macro, stack_name, opt_distro)
-
-

macro/Version.py

@@ -36,13 +36,7 @@
 Dependencies = []
 
 # configure the active set of distros
-from macroutils import distro_names as distros
-
-if 'boxturtle' in distros:
-    distros.remove('boxturtle')
-if 'unstable' in distros:
-    distros.remove('unstable')
-
+from macroutils import distro_names, distro_names_buildfarm
 
 def execute(macro, args):
     if args:
@@ -58,6 +52,6 @@ def execute(macro, args):
                     'New in %s</span>' % version)
 
     html = '<span id="rosversion_selector" class="btn-group">\n'
-    html += "\n".join([distro_html(distro, distros) for distro in distros])
+    html += "\n".join([distro_html(distro, distro_names_buildfarm) for distro in distro_names])
     html += '\n</span>'
     return macro.formatter.rawHTML(html)

macro/headers.py

@@ -296,7 +296,7 @@ def doc_html(distros, package_name):
 
 def get_loaded_distros(name, distros):
     loaded_distro_names = []
-    for distro in distro_names:
+    for distro in distros:
         try:
             load_package_manifest(name, distro)
             loaded_distro_names.append(distro)
@@ -306,23 +306,22 @@ def get_loaded_distros(name, distros):
 
 
 def distro_html(distro, distros):
-    if distro not in distros:
-        return ''
-    sorted_distros = sorted(distros)
-    # distro is guaranteed to be in distros
-    assert(distro in distros)
+    sorted_distros = sorted(distro_names)
     distro_index = sorted_distros.index(distro)
     preceding_distros = sorted_distros[:distro_index + 1]
     proceeding_distros = sorted_distros[distro_index:]
 
     active = [(d + '_and_newer') for d in preceding_distros]
     active += [(d + '_and_older') for d in proceeding_distros]
-    active.append(distro)
+    if distro in distros:
+        active.append(distro)
     active = [d.encode("iso-8859-1") for d in active]
     inactive = [(d + '_and_newer') for d in proceeding_distros]
     inactive += [(d + '_and_older') for d in preceding_distros]
     inactive += [d for d in distros if d != distro]
     inactive = [d.encode("iso-8859-1") for d in inactive]
+    if distro not in distro_names_buildfarm:
+        return ''
     sectionarg = "{show:%s, hide:%s, target_ros_distro:'%s'}" % \
         (active, inactive, distro)
     html = (