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.

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

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

Merged
merged 8 commits into from Jan 28, 2017

Conversation

jacquelinekay
Copy link
Contributor

I believe this will hide EOL'd distros from the package pages, but I'm not sure if this is the solution I'd like to settle on.

@dirk-thomas
Copy link
Member

Some of the changes in this PR should be deployed now (e.g. updating hidden distros), some other only after Lunar has been released (e.g. active distro). Therefore those should be separated into two PRs.

@mikaelarguedas
Copy link
Contributor

mikaelarguedas commented Jan 23, 2017

The lunar specific changes have been removed to be added in a follow-up.

hidden_distros = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'unstable']

for hidden_distro in hidden_distros if hidden_distro in distro_names:
distro_names.remove(hidden_distro)
Copy link
Member

Choose a reason for hiding this comment

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

I would suggest using list comprehension for this:

distro_names = [d for d in distro_names if d not in hidden_distros]

Copy link
Contributor

Choose a reason for hiding this comment

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

done thanks

@dirk-thomas
Copy link
Member

dirk-thomas commented Jan 25, 2017

It doesn't have to be address in this PR but if you search for e.g. boxturtle in this repo there are numerous locations where specific distro names are being ignored. It would be good to declare this list once, like these

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']
, instead of in multiple locations.

distros.remove('boxturtle')
if 'unstable' in distros:
distros.remove('unstable')
distros = [d for d in distro_names if d not in distro_names_hidden]
Copy link
Member

Choose a reason for hiding this comment

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

I would expect this breaks the use of the Version macro for "hidden" distros.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, I think I misunterpreted what you meant when you said

but if you search for e.g. boxturtle in this repo there are numerous locations where specific distro names are being ignored

could you clarify how this ties to declaring the list of hidden distros in macroutils ? do you mean creating another list for the subset of distros ignored in version?

Copy link
Member

Choose a reason for hiding this comment

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

The commit where you moved the hidden distros in a single location is good as is. The package and stack headers now use the same list of non-hidden distros.

This case is different for the version macro. It is being used within the content of wiki pages and marks e.g. a paragraph describing a certain feature with the ROS distro when it was added. So it needs to continue to work for all distros. I don't know why this should exclude "boxturtle" and "unstable" (but I wouldn't touch this).

Copy link
Contributor

Choose a reason for hiding this comment

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

got it, thanks

@mikaelarguedas
Copy link
Contributor

#169 (comment) has been addressed

Copy link
Member

@dirk-thomas dirk-thomas left a comment

Choose a reason for hiding this comment

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

lgtm

@mikaelarguedas mikaelarguedas merged commit 28067b3 into master Jan 28, 2017
@mikaelarguedas mikaelarguedas deleted the more_version_tweaks branch January 28, 2017 03:10
@dirk-thomas
Copy link
Member

The change needs to be deployed to the server after being merged.

@mikaelarguedas
Copy link
Contributor

mikaelarguedas commented Feb 1, 2017

had to keep the alteration of the distro_name list for package header to work properly ae0c422

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants