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

Jump to bottom

enable building of dev tools in recent PyQt5 easyconfigs #16469

Merged
merged 4 commits into from Oct 26, 2022
Merged

enable building of dev tools in recent PyQt5 easyconfigs #16469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8360dbd
build missing tool pyrcc5
ThomasHoffmann77 Oct 21, 2022
9042e64
Update PyQt5-5.15.4-GCCcore-11.2.0.eb
ThomasHoffmann77 Oct 24, 2022
d2341f4
@jfgrimm added sanity check commands for tools pyuic5, pylupdate5, an…
ThomasHoffmann77 Oct 25, 2022
8657f4a
@jfgrimm revert PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb
ThomasHoffmann77 Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 21 additions & 8 deletions easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.4-GCCcore-10.2.0.eb
View file
Open in desktop
Expand Up @@ -19,20 +19,28 @@ dependencies = [

default_easyblock = 'PythonPackage'

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

local_pyqt5_sip_install = "sip-install --verbose --target-dir " + local_pylibdir + " "
local_pyqt5_sip_install += "--confirm-license --no-designer-plugin --no-qml-plugin --no-tools"
local_pyqt5_sip_install += "--confirm-license --no-designer-plugin --no-qml-plugin "

local_pyqtweb_configopts = "configure.py --verbose --destdir=%s/PyQt5 " % local_pylibdir
local_pyqtweb_configopts += "--apidir=%(installdir)s/qsci --pyqt-sipdir=%(builddir)s/PyQt5-%(version)s/sip "
local_pyqtweb_configopts += "--apidir=%(installdir)s/qsci "
local_pyqtweb_configopts += "--pyqt-sipdir=%s " % local_sipdir
local_pyqtweb_configopts += "--sipdir=%s " % local_sipdir
local_pyqtweb_configopts += "--no-stubs --no-dist-info"

local_pyqt_configopts = "configure.py --verbose --destdir=%s " % local_pylibdir
local_pyqt_configopts += "--no-stubs "
local_pyqt_configopts += "--confirm-license --no-designer-plugin --no-qml-plugin "
# prevent installing pyrcc5 and other tools into $EBROOTPYTHON/bin:
local_pyqt_configopts += "--bindir=%(installdir)s/bin "
local_pyqt_configopts += "--sipdir=%s " % local_sipdir

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.5.0'

components = [
('SIP', local_sipver, {
'source_urls': [PYPI_SOURCE],
Expand Down Expand Up @@ -63,10 +71,10 @@ components = [
'source_urls': [PYPI_SOURCE],
'sources': [SOURCE_TAR_GZ],
'checksums': ['2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be'],
'easyblock': 'Binary',
'easyblock': 'ConfigureMakePythonPackage',
'start_dir': '%(name)s-%(version)s',
'skipsteps': ['configure', 'build'],
'install_cmd': local_setup_env + local_pyqt5_sip_install,
'preconfigopts': local_setup_env,
'configopts': local_pyqt_configopts
}),

('PyQtWebEngine', version, {
Expand All @@ -82,13 +90,18 @@ components = [
]

sanity_check_paths = {
'files': ['bin/pyqt-bundle', 'bin/sip-build', 'bin/sip-install', 'bin/sip-wheel'],
'files': ['bin/%s' % x for x in [
'pyrcc5', 'pyuic5', 'pylupdate5', 'pyqt-bundle', 'sip-build', 'sip-install', 'sip5']],
'dirs': ['lib/python%(pyshortver)s/site-packages'],
}

sanity_check_commands = [
"python -c 'import PyQt5.QtCore'",
"sip-wheel --help",
"sip5 --help",
"pyuic5 --help",
"pylupdate5 -version 2>&1 | grep 'pylupdate5 v%(version)s'",
"pyrcc5 -version 2>&1 | grep 'pyrcc5 v%(version)s'",
]

modextrapaths = {
Expand Down
27 changes: 21 additions & 6 deletions easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.4-GCCcore-10.3.0.eb
View file
Open in desktop
Expand Up @@ -18,15 +18,26 @@ dependencies = [

default_easyblock = 'PythonPackage'

local_sipdir = '%(installdir)s/share/sip'

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

local_pyqt5_sip_install = "sip-install --verbose --target-dir " + local_pylibdir + " "
local_pyqt5_sip_install += "--confirm-license --no-designer-plugin --no-qml-plugin --no-tools"
local_pyqt5_sip_install += "--confirm-license --no-designer-plugin --no-qml-plugin "

local_pyqtweb_configopts = "configure.py --verbose --destdir=%s/PyQt5 " % local_pylibdir
local_pyqtweb_configopts += "--apidir=%(installdir)s/qsci --pyqt-sipdir=%(builddir)s/PyQt5-%(version)s/sip "
local_pyqtweb_configopts += "--apidir=%(installdir)s/qsci "
local_pyqtweb_configopts += "--pyqt-sipdir=%s " % local_sipdir
local_pyqtweb_configopts += "--sipdir=%s " % local_sipdir
local_pyqtweb_configopts += "--no-stubs --no-dist-info"

local_pyqt_configopts = "configure.py --verbose --destdir=%s " % local_pylibdir
local_pyqt_configopts += "--no-stubs "
local_pyqt_configopts += "--confirm-license --no-designer-plugin --no-qml-plugin "
# prevent installing pyrcc5 and other tools into $EBROOTPYTHON/bin:
local_pyqt_configopts += "--bindir=%(installdir)s/bin "
local_pyqt_configopts += "--sipdir=%s " % local_sipdir

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.5.0'
Expand Down Expand Up @@ -57,10 +68,10 @@ components = [
'source_urls': [PYPI_SOURCE],
'sources': [SOURCE_TAR_GZ],
'checksums': ['2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be'],
'easyblock': 'Binary',
'easyblock': 'ConfigureMakePythonPackage',
'start_dir': '%(name)s-%(version)s',
'skipsteps': ['configure', 'build'],
'install_cmd': local_setup_env + local_pyqt5_sip_install,
'preconfigopts': local_setup_env,
'configopts': local_pyqt_configopts
}),
('PyQtWebEngine', version, {
'source_urls': [PYPI_SOURCE],
Expand All @@ -75,13 +86,17 @@ components = [
]

sanity_check_paths = {
'files': ['bin/pyqt-bundle', 'bin/sip-build', 'bin/sip-install', 'bin/sip5'],
'files': ['bin/%s' % x for x in [
'pyrcc5', 'pyuic5', 'pylupdate5', 'pyqt-bundle', 'sip-build', 'sip-install', 'sip5']],
'dirs': ['lib/python%(pyshortver)s/site-packages'],
}

sanity_check_commands = [
"python -c 'import PyQt5.QtCore'",
"sip5 --help",
"pyuic5 --help",
"pylupdate5 -version 2>&1 | grep 'pylupdate5 v%(version)s'",
"pyrcc5 -version 2>&1 | grep 'pyrcc5 v%(version)s'",
]

modextrapaths = {
Expand Down
27 changes: 21 additions & 6 deletions easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.4-GCCcore-11.2.0.eb
View file
Open in desktop
Expand Up @@ -18,15 +18,26 @@ dependencies = [

default_easyblock = 'PythonPackage'

local_sipdir = '%(installdir)s/share/sip'

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

local_pyqt5_sip_install = "sip-install --verbose --target-dir " + local_pylibdir + " "
local_pyqt5_sip_install += "--confirm-license --no-designer-plugin --no-qml-plugin --no-tools"
local_pyqt5_sip_install += "--confirm-license --no-designer-plugin --no-qml-plugin "

local_pyqtweb_configopts = "configure.py --verbose --destdir=%s/PyQt5 " % local_pylibdir
local_pyqtweb_configopts += "--apidir=%(installdir)s/qsci --pyqt-sipdir=%(builddir)s/PyQt5-%(version)s/sip "
local_pyqtweb_configopts += "--apidir=%(installdir)s/qsci "
local_pyqtweb_configopts += "--pyqt-sipdir=%s " % local_sipdir
local_pyqtweb_configopts += "--sipdir=%s " % local_sipdir
local_pyqtweb_configopts += "--no-stubs --no-dist-info"

local_pyqt_configopts = "configure.py --verbose --destdir=%s " % local_pylibdir
local_pyqt_configopts += "--no-stubs "
local_pyqt_configopts += "--confirm-license --no-designer-plugin --no-qml-plugin "
# prevent installing pyrcc5 and other tools into $EBROOTPYTHON/bin:
local_pyqt_configopts += "--bindir=%(installdir)s/bin "
local_pyqt_configopts += "--sipdir=%s " % local_sipdir

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.5.0'
Expand Down Expand Up @@ -57,10 +68,10 @@ components = [
'source_urls': [PYPI_SOURCE],
'sources': [SOURCE_TAR_GZ],
'checksums': ['2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be'],
'easyblock': 'Binary',
'easyblock': 'ConfigureMakePythonPackage',
'start_dir': '%(name)s-%(version)s',
'skipsteps': ['configure', 'build'],
'install_cmd': local_setup_env + local_pyqt5_sip_install,
'preconfigopts': local_setup_env,
'configopts': local_pyqt_configopts
}),
('PyQtWebEngine', version, {
'source_urls': [PYPI_SOURCE],
Expand All @@ -75,13 +86,17 @@ components = [
]

sanity_check_paths = {
'files': ['bin/pyqt-bundle', 'bin/sip-build', 'bin/sip-install', 'bin/sip5'],
'files': ['bin/%s' % x for x in [
'pyrcc5', 'pyuic5', 'pylupdate5', 'pyqt-bundle', 'sip-build', 'sip-install', 'sip5']],
'dirs': ['lib/python%(pyshortver)s/site-packages'],
}

sanity_check_commands = [
"python -c 'import PyQt5.QtCore'",
"sip5 --help",
"pyuic5 --help",
"pylupdate5 -version 2>&1 | grep 'pylupdate5 v%(version)s'",
"pyrcc5 -version 2>&1 | grep 'pyrcc5 v%(version)s'",
]

modextrapaths = {
Expand Down