Skip to content

modify logic in QScintilla easyblock to find the PyQt5 sipdir in more places #2868

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

Merged
boegel merged 3 commits into from
Mar 1, 2023
Merged

modify logic in QScintilla easyblock to find the PyQt5 sipdir in more places #2868

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e357a40
modified the logic to find the PyQt5 sipdir in more places
mboisson Jan 26, 2023
a90d617
appeasing hound
mboisson Jan 26, 2023
3e491c0
fixed typos
mboisson Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions easybuild/easyblocks/q/qscintilla.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,23 @@ def install_step(self):
pyshortver = '.'.join(get_software_version('Python').split('.')[:2])

sip_incdir = find_glob_pattern(os.path.join(self.pyqt_root, 'include', 'python%s*' % pyshortver), False)
# in case PyQt5's sip was installed in directories that are specific to each version of python
# as could happen with multi_deps
pyqt_sipdir = find_glob_pattern(os.path.join(self.pyqt_root, 'share', 'python%s*' % pyshortver,
'site-packages', 'sip', self.pyqt_pkg_name), False)
# fall back to a single sipdir
# depending on PyQt5 versions and how it was installed, the sip directory could be in various places
# test them and figure out the first one that matches
pyqt_sip_subdir = [os.path.join('share', 'python%s*' % pyshortver, 'site-packages', 'sip',
self.pyqt_pkg_name),
os.path.join('share', 'sip', self.pyqt_pkg_name),
os.path.join('share', 'sip'),
os.path.join('lib', 'python%s*' % pyshortver, 'site-packages', self.pyqt_pkg_name,
'bindings')
]
pyqt_sipdir_options = [os.path.join(self.pyqt_root, subdir) for subdir in pyqt_sip_subdir]
for pyqt_sipdir_option in pyqt_sipdir_options:
pyqt_sipdir = find_glob_pattern(pyqt_sipdir_option, False)
if pyqt_sipdir:
break

if not pyqt_sipdir:
if LooseVersion(get_software_version(self.pyqt_pkg_name)) >= LooseVersion('5.15'):
pyqt_sipdir = os.path.join(self.pyqt_root, 'share', 'sip')
else:
pyqt_sipdir = os.path.join(self.pyqt_root, 'share', 'sip', self.pyqt_pkg_name)
raise EasyBuildError("Failed to find PyQt5 sip directory")

cfgopts = [
'--destdir %s' % os.path.join(self.installdir, pylibdir),
Expand Down