modify logic in QScintilla easyblock to find the PyQt5 sipdir in more places #2868
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.
When installing PyQt5 5.15.5 as an extension of Qt5 5.15.8, two things happen
The current
qscintilla.py
at line https://github.com/easybuilders/easybuild-easyblocks/blob/develop/easybuild/easyblocks/q/qscintilla.py#L127 testsget_software_version('PyQt5')
, which returns None, sincePyQt5
is it is part ofQt5
, notPyQt5
module (see support for this at https://github.com/easybuilders/easybuild-easyblocks/blob/develop/easybuild/easyblocks/q/qscintilla.py#L60)Our SIP files are not in the locations that are tested, i.e. previously, we had:
now we have:
This PR avoids using
get_software_version('PyQt5')
altogether, and instead tests various possible location of PyQt5 sip dir, and picks the first one that matches.