Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add lunar to version macro, possible fix for eol distros in status bar #169

Merged
merged 8 commits into from Jan 28, 2017
Merged

add lunar to version macro, possible fix for eol distros in status bar #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7b45c7
add lunar to version macro, possible fix for eol distros in status bar
May 23, 2016
08ecba5
add hydro to hidden distros
mikaelarguedas Jan 23, 2017
9c3bc5a
list comprehension for distro_names
mikaelarguedas Jan 25, 2017
1a62c4c
comprehension list 2nd round
mikaelarguedas Jan 25, 2017
4abc497
declare distro_names_hidden in macroutils
mikaelarguedas Jan 25, 2017
b56b9a3
use distro_names_hidden everywhere
mikaelarguedas Jan 25, 2017
f09d5d2
remove todo
mikaelarguedas Jan 25, 2017
ccdf25a
restore version distros
mikaelarguedas Jan 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 2 additions & 9 deletions macro/PackageHeader.py
View file
Open in desktop
@@ -1,20 +1,13 @@
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_hidden, 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')
distro_names = [d for d in distro_names if d not in distro_names_hidden]

def generate_old_package_header(macro, package_name, opt_distro=None):
if not package_name:
Expand Down
11 changes: 2 additions & 9 deletions macro/StackHeader.py
View file
Open in desktop
Expand Up @@ -2,20 +2,13 @@
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_hidden, 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')
distro_names = [d for d in distro_names if d not in distro_names_hidden]

def generate_old_stack_header(macro, stack_name, opt_distro=None):
try:
Expand Down
5 changes: 2 additions & 3 deletions macro/Version.py
View file
Open in desktop
Expand Up @@ -47,11 +47,10 @@
def execute(macro, args):
if args:
version = str(args)
if version.lower() == 'l-turtle':
# TODO Change when l-turtle name is decided
if version.lower() == 'lunar':
return ('<span style="background-color:#FFFF00; '
'font-weight:bold; padding: 3px;">'
'Expected in L-Turtle</span>')
'Expected in Lunar</span>')
else:
return ('<span style="background-color:#FFFF00; '
'font-weight:bold; padding: 3px;">'
Expand Down
2 changes: 2 additions & 0 deletions macro/macroutils.py
View file
Open in desktop
Expand Up @@ -14,10 +14,12 @@
distro_names = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'indigo', 'jade', 'kinetic', 'unstable']
distro_names_indexed = ['diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'indigo', 'jade', 'kinetic', 'unstable'] #boxturtle and cturtle not indexed
distro_names_buildfarm = ['indigo', 'jade', 'kinetic']
distro_names_hidden = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'unstable']

doc_url = "http://docs.ros.org/"

doc_path = '/home/rosbot/docs/'

metrics_path = '/var/www/www.ros.org/metrics/'

MISSING_DOC_TMPL = 'Cannot load information on <strong>%(name)s</strong>, which means that it is not yet in our index.'
Expand Down