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

revert to using a bundle of components to install PyQt5, rather than a bundle of extensions #13336

Merged
merged 3 commits into from
Jul 3, 2021
Merged

revert to using a bundle of components to install PyQt5, rather than a bundle of extensions #13336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5df497d
Revert PyQt5 to a bundle with components
branfosj Jul 3, 2021
20a995c
using components is the important part
branfosj Jul 3, 2021
11ee9ec
appease the CI
branfosj Jul 3, 2021
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
13 changes: 12 additions & 1 deletion easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ dependencies = [
('Qt5', '5.14.2'),
]

default_easyblock = 'PythonPackage'

use_pip = True

local_pylibdir = '%(installdir)s/lib/python%(pyshortver)s/site-packages'

local_pyqt5_sip_install = "sip-install --verbose --target-dir " + local_pylibdir + " "
Expand All @@ -28,7 +32,7 @@ local_pyqtweb_configopts += "--no-stubs --no-dist-info"
local_setup_env = "export PATH=%(installdir)s/bin:$PATH && "
local_setup_env += "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
local_sipver = '5.4.0'
exts_list = [
components = [
('SIP', local_sipver, {
'sources': [SOURCELOWER_TAR_GZ],
'checksums': ['4282ab45948674f5ef74278a8e70d1302f65c95b519a0af19409002f5715d641'],
Expand All @@ -37,23 +41,27 @@ exts_list = [
'options': {'modulename': 'PyQt5.sip'},
}),
('PyQt-builder', '1.5.0', {
'sources': [SOURCE_TAR_GZ],
'checksums': ['11bbe26e8e3d5ffec6d2ef2f50596b1670eb2d8b49aee0f859821922d8282841'],
'start_dir': 'PyQt-builder-%(version)s',
'use_pip': True,
}),
('PyQt5_sip', '12.8.1', {
'sources': [SOURCE_TAR_GZ],
'checksums': ['30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd'],
'start_dir': 'PyQt5_sip-%(version)s',
'use_pip': True,
}),
(name, version, {
'sources': [SOURCE_TAR_GZ],
'checksums': ['d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1'],
'easyblock': 'Binary',
'start_dir': '%(name)s-%(version)s',
'skipsteps': ['configure', 'build'],
'install_cmd': local_setup_env + local_pyqt5_sip_install,
}),
('PyQtWebEngine', version, {
'sources': [SOURCE_TAR_GZ],
'checksums': ['f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439'],
'easyblock': 'ConfigureMakePythonPackage',
'start_dir': '%(name)s-%(version)s',
Expand All @@ -63,6 +71,8 @@ exts_list = [
}),
]

sanity_pip_check = True

sanity_check_paths = {
'files': ['bin/pyqt-bundle', 'bin/sip-build', 'bin/sip-install', 'bin/sip5'],
'dirs': ['lib/python%(pyshortver)s/site-packages'],
Expand All @@ -74,6 +84,7 @@ sanity_check_commands = [
]

modextrapaths = {
'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
'QT_INSTALL_DATA': 'qsci',
}

Expand Down
13 changes: 12 additions & 1 deletion easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ dependencies = [
('Qt5', '5.14.1'),
]

default_easyblock = 'PythonPackage'

use_pip = True

local_pylibdir = '%(installdir)s/lib/python%(pyshortver)s/site-packages'

local_pyqt5_sip_install = "sip-install --verbose --target-dir " + local_pylibdir + " "
Expand All @@ -29,7 +33,7 @@ local_pyqtweb_configopts += "--no-stubs --no-dist-info"
local_setup_env = "export PATH=%(installdir)s/bin:$PATH && "
local_setup_env += "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
local_sipver = '5.4.0'
exts_list = [
components = [
('SIP', local_sipver, {
'sources': [SOURCELOWER_TAR_GZ],
'checksums': ['4282ab45948674f5ef74278a8e70d1302f65c95b519a0af19409002f5715d641'],
Expand All @@ -38,23 +42,27 @@ exts_list = [
'options': {'modulename': 'PyQt5.sip'},
}),
('PyQt-builder', '1.5.0', {
'sources': [SOURCE_TAR_GZ],
'checksums': ['11bbe26e8e3d5ffec6d2ef2f50596b1670eb2d8b49aee0f859821922d8282841'],
'start_dir': 'PyQt-builder-%(version)s',
'use_pip': True,
}),
('PyQt5_sip', '12.8.1', {
'sources': [SOURCE_TAR_GZ],
'checksums': ['30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd'],
'start_dir': 'PyQt5_sip-%(version)s',
'use_pip': True,
}),
(name, version, {
'sources': [SOURCE_TAR_GZ],
'checksums': ['d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1'],
'easyblock': 'Binary',
'start_dir': '%(name)s-%(version)s',
'skipsteps': ['configure', 'build'],
'install_cmd': local_setup_env + local_pyqt5_sip_install,
}),
('PyQtWebEngine', version, {
'sources': [SOURCE_TAR_GZ],
'checksums': ['f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439'],
'easyblock': 'ConfigureMakePythonPackage',
'start_dir': '%(name)s-%(version)s',
Expand All @@ -64,6 +72,8 @@ exts_list = [
}),
]

sanity_pip_check = True

sanity_check_paths = {
'files': ['bin/pyqt-bundle', 'bin/sip-build', 'bin/sip-install', 'bin/sip5'],
'dirs': ['lib/python%(pyshortver)s/site-packages'],
Expand All @@ -75,6 +85,7 @@ sanity_check_commands = [
]

modextrapaths = {
'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
'QT_INSTALL_DATA': 'qsci',
}

Expand Down