Merge pull request #13336 from branfosj/20210703084145_new_pr_PyQt55151

revert to using a bundle of components to install PyQt5, rather than a bundle of extensions
easybuilders · Jul 3, 2021 · 81ac21b · 81ac21b
2 parents 4f525a2 + 11ee9ec
commit 81ac21b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 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
@@ -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 + " "
@@ -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'],
@@ -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',
@@ -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'],
@@ -74,6 +84,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
@@ -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 + " "
@@ -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'],
@@ -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',
@@ -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'],
@@ -75,6 +85,7 @@ sanity_check_commands = [
 ]
 
 modextrapaths = {
+    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
     'QT_INSTALL_DATA': 'qsci',
 }