Merge pull request #13371 from Flamefire/20210707163443_new_pr_PyQt55151

Fix PyQt 5.15.1 ECs
easybuilders · Jul 10, 2021 · 0af5580 · 0af5580
2 parents 448cca6 + 64fd9cf
commit 0af5580
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 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
@@ -1,4 +1,4 @@
-easyblock = 'PythonBundle'
+easyblock = 'Bundle'
 
 name = 'PyQt5'
 version = '5.15.1'
@@ -18,8 +18,6 @@ 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 + " "
@@ -34,25 +32,29 @@ 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,
         'use_pip': True,
         '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',
@@ -61,6 +63,7 @@ components = [
         'install_cmd': local_setup_env + local_pyqt5_sip_install,
     }),
     ('PyQtWebEngine', version, {
+        'source_urls': [PYPI_SOURCE],
         'sources': [SOURCE_TAR_GZ],
         'checksums': ['f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439'],
         'easyblock': 'ConfigureMakePythonPackage',
@@ -71,8 +74,6 @@ 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
@@ -1,4 +1,4 @@
-easyblock = 'PythonBundle'
+easyblock = 'Bundle'
 
 name = 'PyQt5'
 version = '5.15.1'
@@ -19,8 +19,6 @@ 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 + " "
@@ -35,25 +33,29 @@ 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,
         'use_pip': True,
         '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',
@@ -62,6 +64,7 @@ components = [
         'install_cmd': local_setup_env + local_pyqt5_sip_install,
     }),
     ('PyQtWebEngine', version, {
+        'source_urls': [PYPI_SOURCE],
         'sources': [SOURCE_TAR_GZ],
         'checksums': ['f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439'],
         'easyblock': 'ConfigureMakePythonPackage',
@@ -72,8 +75,6 @@ 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'],