Support ubuntu jammy, noble, and oracular with their appropriate qt #791
+65
−14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamlamar
force-pushed
the
ubuntu-qt6
branch
from
559fe8b to
7cd3ee1
Compare
|
@adamlamar Thank you for the PR. @veloman-yunkan will have a look to this PR this WE. |
veloman-yunkan
requested changes
Dec 22, 2024
Comment on lines
127
to
140
| for config in ConfigInfo.all_running_configs.values(): | ||
| # get {host}_{config} packages | ||
| mapper_name = "{host}_{config}".format( | ||
| host=neutralEnv("distname"), config=config | ||
| ) | ||
| package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {}) | ||
| packages_list += package_name_mapper.get("COMMON", []) | ||
| # get {host}_{codename}_{config} packages | ||
| mapper_name = "{host}_{codename}_{config}".format( | ||
| host=neutralEnv("distname"), codename=neutralEnv("codename"), config=config | ||
| ) | ||
| package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {}) | ||
| packages_list += package_name_mapper.get("COMMON", []) | ||
|
|
There was a problem hiding this comment.
I don't like the code duplication introduced here and in the other change in this (_get_packages()) function.
You can avoid it with the help of an auxiliary function _get_mapper_names_for_config(config):
def _get_mapper_names_for_config(config):
host = neutralEnv("distname")
codename = neutralEnv("codename")
return ( f"{host}_{config}", f"{host}_{codename}_{config}" )Then your code here will turn into:
for config in ConfigInfo.all_running_configs.values():
for mapper_name in _get_mapper_names_for_config(config):
package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {})
packages_list += package_name_mapper.get("COMMON", [])
Comment on lines
+155
to
+167
|
|
||
| # get {host}_{codename}_{config} packages | ||
| mapper_name = "{host}_{codename}_{config}".format( | ||
| host=neutralEnv("distname"), codename=neutralEnv("codename"), config=configName | ||
| ) | ||
| package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {}) | ||
| packages = package_name_mapper.get(builderName) | ||
| if packages: | ||
| to_drop.append(builderDef) | ||
| if packages is not True: | ||
| # True means "assume the dependency is install but do not try to install anything for it" | ||
| packages_list += packages | ||
|
|
There was a problem hiding this comment.
Get rid of this code duplication taking advantage of _get_mapper_names_for_config() like proposed in the previous comment.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds package profiles for various versions of ubuntu - jammy, noble, oracular, and uses their appropriate versions of Qt.
When specifying packages, you can now use the LSB
codenamein thePACKAGE_NAME_MAPPERSdictionary, giving more control about whether (say) a qt package should be installed as version 5 or 6. For exampleubuntu_jammy_native_dynandubuntu_noble_native_dynare now checked to find the package list. Similarlydebian_bookworm_native_dyncould be used, but I didn't change any existing package lists.