From b5f761d38abd4326537bc4fe198a5e4bb3026d4f Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 30 Aug 2024 16:51:12 +0200 Subject: [PATCH] Move exts_default_options to top-level parameters forPythonBundle ECs It is easier in the top-level and might cause confusion with https://github.com/easybuilders/easybuild-easyblocks/pull/3428 --- .../cell2location-0.05-alpha-fosscuda-2020b.eb | 8 ++------ easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-12.3.0.eb | 8 +++----- easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.2.0.eb | 8 +++----- easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.3.0.eb | 8 +++----- .../g/GI-DocGen/GI-DocGen-2023.3-GCCcore-12.3.0.eb | 8 +++----- .../OpenStackClient-5.5.0-GCCcore-10.2.0.eb | 8 ++++---- .../OpenStackClient-5.8.0-GCCcore-11.2.0.eb | 8 ++++---- .../OpenStackClient-6.0.0-GCCcore-12.2.0.eb | 8 ++++---- .../p/PyClone/PyClone-2020.9b2-GCCcore-10.2.0.eb | 8 +++----- .../Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb | 8 +++----- .../Python-bundle-PyPI-2023.10-GCCcore-13.2.0.eb | 8 +++----- .../Python-bundle-PyPI-2024.06-GCCcore-13.3.0.eb | 8 +++----- .../setuptools-rust-1.6.0-GCCcore-12.3.0.eb | 8 +++----- .../setuptools-rust-1.8.0-GCCcore-13.2.0.eb | 8 +++----- .../setuptools-rust-1.9.0-GCCcore-13.3.0.eb | 8 +++----- .../v/virtualenv/virtualenv-20.23.1-GCCcore-12.3.0.eb | 8 +++----- .../v/virtualenv/virtualenv-20.24.6-GCCcore-13.2.0.eb | 8 +++----- .../v/virtualenv/virtualenv-20.26.2-GCCcore-13.3.0.eb | 8 +++----- 18 files changed, 56 insertions(+), 88 deletions(-) diff --git a/easybuild/easyconfigs/c/cell2location/cell2location-0.05-alpha-fosscuda-2020b.eb b/easybuild/easyconfigs/c/cell2location/cell2location-0.05-alpha-fosscuda-2020b.eb index 9a0eeba16281..377548ff5b58 100644 --- a/easybuild/easyconfigs/c/cell2location/cell2location-0.05-alpha-fosscuda-2020b.eb +++ b/easybuild/easyconfigs/c/cell2location/cell2location-0.05-alpha-fosscuda-2020b.eb @@ -43,14 +43,10 @@ dependencies = [ preinstallopts = "sed -i 's/theano/Theano-PyMC/g' setup.py && " +download_dep_fail = True +sanity_pip_check = True use_pip = True -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} - exts_list = [ ('opt-einsum', '3.3.0', { 'source_tmpl': 'opt_einsum-%(version)s.tar.gz', diff --git a/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-12.3.0.eb index 15b9ad83d78f..c2b2e4cb526d 100644 --- a/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-12.3.0.eb @@ -17,11 +17,9 @@ dependencies = [ ('Python', '3.11.3'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('idna', '3.4', { diff --git a/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.2.0.eb index 79b1a625e7ee..f2d58b63db36 100644 --- a/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.2.0.eb @@ -18,11 +18,9 @@ dependencies = [ ('Python', '3.11.5'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('idna', '3.4', { diff --git a/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.3.0.eb index ddc99b99a370..784f9ab0c4c6 100644 --- a/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/f/flit/flit-3.9.0-GCCcore-13.3.0.eb @@ -18,11 +18,9 @@ dependencies = [ ('Python', '3.12.3'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('idna', '3.7', { diff --git a/easybuild/easyconfigs/g/GI-DocGen/GI-DocGen-2023.3-GCCcore-12.3.0.eb b/easybuild/easyconfigs/g/GI-DocGen/GI-DocGen-2023.3-GCCcore-12.3.0.eb index d098c3c3cbc0..74753717dc30 100644 --- a/easybuild/easyconfigs/g/GI-DocGen/GI-DocGen-2023.3-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/g/GI-DocGen/GI-DocGen-2023.3-GCCcore-12.3.0.eb @@ -21,11 +21,9 @@ dependencies = [ ('Python-bundle-PyPI', '2023.06'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('Markdown', '3.5.2', { diff --git a/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-5.5.0-GCCcore-10.2.0.eb b/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-5.5.0-GCCcore-10.2.0.eb index b013362d2e5d..0ace8359f582 100644 --- a/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-5.5.0-GCCcore-10.2.0.eb +++ b/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-5.5.0-GCCcore-10.2.0.eb @@ -16,9 +16,10 @@ dependencies = [ ] builddependencies = [('binutils', '2.35')] -exts_default_options = { - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True + exts_list = [ ('pbr', '5.6.0', { 'checksums': ['42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd'], @@ -121,7 +122,6 @@ exts_list = [ }), ] -sanity_pip_check = True enhance_sanity_check = True sanity_check_commands = ['openstack -h'] diff --git a/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb b/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb index e590dd730ca7..0ee8e70f160a 100644 --- a/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb @@ -16,9 +16,10 @@ dependencies = [ ] builddependencies = [('binutils', '2.37')] -exts_default_options = { - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True + exts_list = [ ('pyperclip', '1.8.2', { 'checksums': ['105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57'], @@ -121,7 +122,6 @@ exts_list = [ }), ] -sanity_pip_check = True enhance_sanity_check = True sanity_check_commands = ['openstack -h'] diff --git a/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-6.0.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-6.0.0-GCCcore-12.2.0.eb index 6b695f632798..a9032b4205d6 100644 --- a/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-6.0.0-GCCcore-12.2.0.eb +++ b/easybuild/easyconfigs/o/OpenStackClient/OpenStackClient-6.0.0-GCCcore-12.2.0.eb @@ -15,9 +15,10 @@ dependencies = [ ] builddependencies = [('binutils', '2.39')] -exts_default_options = { - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True + exts_list = [ ('pyperclip', '1.8.2', { 'checksums': ['105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57'], @@ -114,7 +115,6 @@ exts_list = [ }), ] -sanity_pip_check = True enhance_sanity_check = True sanity_check_commands = ['openstack -h'] diff --git a/easybuild/easyconfigs/p/PyClone/PyClone-2020.9b2-GCCcore-10.2.0.eb b/easybuild/easyconfigs/p/PyClone/PyClone-2020.9b2-GCCcore-10.2.0.eb index ee4425b49c5d..ae37a4fab0cf 100644 --- a/easybuild/easyconfigs/p/PyClone/PyClone-2020.9b2-GCCcore-10.2.0.eb +++ b/easybuild/easyconfigs/p/PyClone/PyClone-2020.9b2-GCCcore-10.2.0.eb @@ -21,9 +21,9 @@ dependencies = [ ('Python', '3.8.6'), ] -exts_default_options = { - 'use_pip': True -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('Logbook', '1.5.3', { @@ -37,6 +37,4 @@ exts_list = [ }), ] -sanity_pip_check = True - moduleclass = 'tools' diff --git a/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb b/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb index 6a91bcca5e41..5c73d50284e9 100644 --- a/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb @@ -26,11 +26,9 @@ dependencies = [ ('virtualenv', '20.23.1'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True # order is important! # package versions updated 2023-06-26 diff --git a/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2023.10-GCCcore-13.2.0.eb b/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2023.10-GCCcore-13.2.0.eb index d551945f5e7d..20489b70bc14 100644 --- a/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2023.10-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2023.10-GCCcore-13.2.0.eb @@ -26,11 +26,9 @@ dependencies = [ ('virtualenv', '20.24.6'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True # order is important! # package versions updated 2023-10-29 diff --git a/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2024.06-GCCcore-13.3.0.eb b/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2024.06-GCCcore-13.3.0.eb index 01bf9b19b0ac..843a30743e49 100644 --- a/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2024.06-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/p/Python-bundle-PyPI/Python-bundle-PyPI-2024.06-GCCcore-13.3.0.eb @@ -28,11 +28,9 @@ dependencies = [ ('virtualenv', '20.26.2'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True # order is important! # package versions updated 2024-06-14 diff --git a/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.6.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.6.0-GCCcore-12.3.0.eb index 8cbf2db9fe75..0cb2f85f490a 100644 --- a/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.6.0-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.6.0-GCCcore-12.3.0.eb @@ -18,11 +18,9 @@ dependencies = [ ('Python', '3.11.3'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('typing_extensions', '4.6.3', { diff --git a/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.8.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.8.0-GCCcore-13.2.0.eb index 669229c8f11d..de5cc58c988c 100644 --- a/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.8.0-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.8.0-GCCcore-13.2.0.eb @@ -18,11 +18,9 @@ dependencies = [ ('Python', '3.11.5'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('typing_extensions', '4.8.0', { diff --git a/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.9.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.9.0-GCCcore-13.3.0.eb index a8ad0dc7ee95..4d83557f5ec6 100644 --- a/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.9.0-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/s/setuptools-rust/setuptools-rust-1.9.0-GCCcore-13.3.0.eb @@ -18,11 +18,9 @@ dependencies = [ ('Python', '3.12.3'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('typing-extensions', '4.12.2', { diff --git a/easybuild/easyconfigs/v/virtualenv/virtualenv-20.23.1-GCCcore-12.3.0.eb b/easybuild/easyconfigs/v/virtualenv/virtualenv-20.23.1-GCCcore-12.3.0.eb index 122f3d8d6c83..b6ff21ecb8dc 100644 --- a/easybuild/easyconfigs/v/virtualenv/virtualenv-20.23.1-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/v/virtualenv/virtualenv-20.23.1-GCCcore-12.3.0.eb @@ -18,11 +18,9 @@ dependencies = [ ('Python', '3.11.3'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('distlib', '0.3.6', { diff --git a/easybuild/easyconfigs/v/virtualenv/virtualenv-20.24.6-GCCcore-13.2.0.eb b/easybuild/easyconfigs/v/virtualenv/virtualenv-20.24.6-GCCcore-13.2.0.eb index a0b9921fb5cc..394c063e4ca1 100644 --- a/easybuild/easyconfigs/v/virtualenv/virtualenv-20.24.6-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/v/virtualenv/virtualenv-20.24.6-GCCcore-13.2.0.eb @@ -18,11 +18,9 @@ dependencies = [ ('Python', '3.11.5'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('distlib', '0.3.7', { diff --git a/easybuild/easyconfigs/v/virtualenv/virtualenv-20.26.2-GCCcore-13.3.0.eb b/easybuild/easyconfigs/v/virtualenv/virtualenv-20.26.2-GCCcore-13.3.0.eb index 9c6a84c53045..c22daca97c9a 100644 --- a/easybuild/easyconfigs/v/virtualenv/virtualenv-20.26.2-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/v/virtualenv/virtualenv-20.26.2-GCCcore-13.3.0.eb @@ -18,11 +18,9 @@ dependencies = [ ('Python', '3.12.3'), ] -exts_default_options = { - 'download_dep_fail': True, - 'sanity_pip_check': True, - 'use_pip': True, -} +download_dep_fail = True +sanity_pip_check = True +use_pip = True exts_list = [ ('distlib', '0.3.8', {