From 5df497d0e61f6710e8105ec05b305c2b5dbe6600 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 3 Jul 2021 08:41:46 +0100 Subject: [PATCH 1/3] Revert PyQt5 to a bundle with components --- .../p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb | 16 ++++++++++++++-- .../PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb index 75f5f65a1ed..2fc24f0a12a 100644 --- a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb +++ b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb @@ -1,4 +1,4 @@ -easyblock = 'PythonBundle' +easyblock = 'Bundle' name = 'PyQt5' version = '5.15.1' @@ -16,6 +16,8 @@ dependencies = [ ('Qt5', '5.14.2'), ] +default_easyblock = 'PythonPackage' + local_pylibdir = '%(installdir)s/lib/python%(pyshortver)s/site-packages' local_pyqt5_sip_install = "sip-install --verbose --target-dir " + local_pylibdir + " " @@ -28,8 +30,9 @@ 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, { + 'source_urls': [PYPI_SOURCE], 'sources': [SOURCELOWER_TAR_GZ], 'checksums': ['4282ab45948674f5ef74278a8e70d1302f65c95b519a0af19409002f5715d641'], 'start_dir': 'sip-%s' % local_sipver, @@ -37,16 +40,22 @@ exts_list = [ 'options': {'modulename': 'PyQt5.sip'}, }), ('PyQt-builder', '1.5.0', { + 'source_urls': [PYPI_SOURCE], + 'sources': [SOURCE_TAR_GZ], 'checksums': ['11bbe26e8e3d5ffec6d2ef2f50596b1670eb2d8b49aee0f859821922d8282841'], 'start_dir': 'PyQt-builder-%(version)s', 'use_pip': True, }), ('PyQt5_sip', '12.8.1', { + 'source_urls': [PYPI_SOURCE], + 'sources': [SOURCE_TAR_GZ], 'checksums': ['30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd'], 'start_dir': 'PyQt5_sip-%(version)s', 'use_pip': True, }), (name, version, { + 'source_urls': [PYPI_SOURCE], + 'sources': [SOURCE_TAR_GZ], 'checksums': ['d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1'], 'easyblock': 'Binary', 'start_dir': '%(name)s-%(version)s', @@ -54,6 +63,8 @@ exts_list = [ 'install_cmd': local_setup_env + local_pyqt5_sip_install, }), ('PyQtWebEngine', version, { + 'source_urls': [PYPI_SOURCE], + 'sources': [SOURCE_TAR_GZ], 'checksums': ['f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439'], 'easyblock': 'ConfigureMakePythonPackage', 'start_dir': '%(name)s-%(version)s', @@ -74,6 +85,7 @@ sanity_check_commands = [ ] modextrapaths = { + 'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages', 'QT_INSTALL_DATA': 'qsci', } diff --git a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb index a85509166d8..2122c835fca 100644 --- a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb +++ b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb @@ -1,4 +1,4 @@ -easyblock = 'PythonBundle' +easyblock = 'Bundle' name = 'PyQt5' version = '5.15.1' @@ -17,6 +17,8 @@ dependencies = [ ('Qt5', '5.14.1'), ] +default_easyblock = 'PythonPackage' + local_pylibdir = '%(installdir)s/lib/python%(pyshortver)s/site-packages' local_pyqt5_sip_install = "sip-install --verbose --target-dir " + local_pylibdir + " " @@ -29,8 +31,9 @@ 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, { + 'source_urls': [PYPI_SOURCE], 'sources': [SOURCELOWER_TAR_GZ], 'checksums': ['4282ab45948674f5ef74278a8e70d1302f65c95b519a0af19409002f5715d641'], 'start_dir': 'sip-%s' % local_sipver, @@ -38,16 +41,22 @@ exts_list = [ 'options': {'modulename': 'PyQt5.sip'}, }), ('PyQt-builder', '1.5.0', { + 'source_urls': [PYPI_SOURCE], + 'sources': [SOURCE_TAR_GZ], 'checksums': ['11bbe26e8e3d5ffec6d2ef2f50596b1670eb2d8b49aee0f859821922d8282841'], 'start_dir': 'PyQt-builder-%(version)s', 'use_pip': True, }), ('PyQt5_sip', '12.8.1', { + 'source_urls': [PYPI_SOURCE], + 'sources': [SOURCE_TAR_GZ], 'checksums': ['30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd'], 'start_dir': 'PyQt5_sip-%(version)s', 'use_pip': True, }), (name, version, { + 'source_urls': [PYPI_SOURCE], + 'sources': [SOURCE_TAR_GZ], 'checksums': ['d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1'], 'easyblock': 'Binary', 'start_dir': '%(name)s-%(version)s', @@ -55,6 +64,8 @@ exts_list = [ 'install_cmd': local_setup_env + local_pyqt5_sip_install, }), ('PyQtWebEngine', version, { + 'source_urls': [PYPI_SOURCE], + 'sources': [SOURCE_TAR_GZ], 'checksums': ['f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439'], 'easyblock': 'ConfigureMakePythonPackage', 'start_dir': '%(name)s-%(version)s', @@ -75,6 +86,7 @@ sanity_check_commands = [ ] modextrapaths = { + 'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages', 'QT_INSTALL_DATA': 'qsci', } From 20a995ce919e254dd1ffeed33641590570d2a119 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 3 Jul 2021 08:53:25 +0100 Subject: [PATCH 2/3] using components is the important part --- .../easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb | 7 +------ .../p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb index 2fc24f0a12a..a44ceb27a7b 100644 --- a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb +++ b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb @@ -1,4 +1,4 @@ -easyblock = 'Bundle' +easyblock = 'PythonBundle' name = 'PyQt5' version = '5.15.1' @@ -32,7 +32,6 @@ local_setup_env += "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/si local_sipver = '5.4.0' components = [ ('SIP', local_sipver, { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCELOWER_TAR_GZ], 'checksums': ['4282ab45948674f5ef74278a8e70d1302f65c95b519a0af19409002f5715d641'], 'start_dir': 'sip-%s' % local_sipver, @@ -40,21 +39,18 @@ components = [ 'options': {'modulename': 'PyQt5.sip'}, }), ('PyQt-builder', '1.5.0', { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCE_TAR_GZ], 'checksums': ['11bbe26e8e3d5ffec6d2ef2f50596b1670eb2d8b49aee0f859821922d8282841'], 'start_dir': 'PyQt-builder-%(version)s', 'use_pip': True, }), ('PyQt5_sip', '12.8.1', { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCE_TAR_GZ], 'checksums': ['30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd'], 'start_dir': 'PyQt5_sip-%(version)s', 'use_pip': True, }), (name, version, { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCE_TAR_GZ], 'checksums': ['d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1'], 'easyblock': 'Binary', @@ -63,7 +59,6 @@ components = [ 'install_cmd': local_setup_env + local_pyqt5_sip_install, }), ('PyQtWebEngine', version, { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCE_TAR_GZ], 'checksums': ['f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439'], 'easyblock': 'ConfigureMakePythonPackage', diff --git a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb index 2122c835fca..d1ec5360931 100644 --- a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb +++ b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb @@ -1,4 +1,4 @@ -easyblock = 'Bundle' +easyblock = 'PythonBundle' name = 'PyQt5' version = '5.15.1' @@ -33,7 +33,6 @@ local_setup_env += "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/si local_sipver = '5.4.0' components = [ ('SIP', local_sipver, { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCELOWER_TAR_GZ], 'checksums': ['4282ab45948674f5ef74278a8e70d1302f65c95b519a0af19409002f5715d641'], 'start_dir': 'sip-%s' % local_sipver, @@ -41,21 +40,18 @@ components = [ 'options': {'modulename': 'PyQt5.sip'}, }), ('PyQt-builder', '1.5.0', { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCE_TAR_GZ], 'checksums': ['11bbe26e8e3d5ffec6d2ef2f50596b1670eb2d8b49aee0f859821922d8282841'], 'start_dir': 'PyQt-builder-%(version)s', 'use_pip': True, }), ('PyQt5_sip', '12.8.1', { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCE_TAR_GZ], 'checksums': ['30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd'], 'start_dir': 'PyQt5_sip-%(version)s', 'use_pip': True, }), (name, version, { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCE_TAR_GZ], 'checksums': ['d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1'], 'easyblock': 'Binary', @@ -64,7 +60,6 @@ components = [ 'install_cmd': local_setup_env + local_pyqt5_sip_install, }), ('PyQtWebEngine', version, { - 'source_urls': [PYPI_SOURCE], 'sources': [SOURCE_TAR_GZ], 'checksums': ['f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439'], 'easyblock': 'ConfigureMakePythonPackage', From 11ee9ec1a154a61f8528a46129d38c3d8de55605 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 3 Jul 2021 09:06:31 +0100 Subject: [PATCH 3/3] appease the CI --- easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb | 4 ++++ .../p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb index a44ceb27a7b..d50e24ff287 100644 --- a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb +++ b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-10.2.0.eb @@ -18,6 +18,8 @@ dependencies = [ 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 + " " @@ -69,6 +71,8 @@ components = [ }), ] +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'], diff --git a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb index d1ec5360931..1005bfa8e3e 100644 --- a/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb +++ b/easybuild/easyconfigs/p/PyQt5/PyQt5-5.15.1-GCCcore-9.3.0-Python-3.8.2.eb @@ -19,6 +19,8 @@ dependencies = [ 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 + " " @@ -70,6 +72,8 @@ components = [ }), ] +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'],