easybuilders · branfosj · Feb 12, 2024 · Feb 12, 2024 · Feb 12, 2024 · Feb 12, 2024
diff --git a/easybuild/easyconfigs/a/ASAP3/ASAP3-3.13.3-foss-2023a.eb b/easybuild/easyconfigs/a/ASAP3/ASAP3-3.13.3-foss-2023a.eb
@@ -24,9 +24,6 @@ dependencies = [
     ('kim-api', '2.3.0'),
 ]
 
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
 
 sanity_check_paths = {
     'files': [],

diff --git a/easybuild/easyconfigs/a/ASAP3/ASAP3-3.13.3-intel-2023a.eb b/easybuild/easyconfigs/a/ASAP3/ASAP3-3.13.3-intel-2023a.eb
@@ -30,9 +30,6 @@ dependencies = [
 ]
 
 installopts = '--verbose'
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
 
 sanity_check_paths = {
     'files': [],

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-14.0.1-gfbf-2023a.eb b/easybuild/easyconfigs/a/Arrow/Arrow-14.0.1-gfbf-2023a.eb
@@ -56,9 +56,6 @@ _pyarrow_preinstall_opts += "PYARROW_WITH_DATASET=1 PYARROW_WITH_PARQUET=1 "
 
 exts_defaultclass = 'PythonPackage'
 exts_default_options = {
-    'download_dep_fail': True,
-    'use_pip': True,
-    'sanity_pip_check': True,
 }
 exts_list = [
     ('pyarrow', version, {

diff --git a/easybuild/easyconfigs/c/CENSO/CENSO-1.2.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/c/CENSO/CENSO-1.2.0-GCCcore-12.3.0.eb
@@ -26,7 +26,6 @@ dependencies = [
     ('Python', '3.11.3'),
 ]
 
-use_pip = True
 
 exts_list = [
     (name, version, {
@@ -37,7 +36,6 @@ exts_list = [
     }),
 ]
 
-sanity_pip_check = True
 
 sanity_check_paths = {
     'files': ['bin/censo'],

diff --git a/easybuild/easyconfigs/c/CSBDeep/CSBDeep-0.7.4-foss-2022a-CUDA-11.7.0.eb b/easybuild/easyconfigs/c/CSBDeep/CSBDeep-0.7.4-foss-2022a-CUDA-11.7.0.eb
@@ -19,8 +19,6 @@ dependencies = [
     ('tqdm', '4.64.0'),
 ]
 
-use_pip = True
-sanity_pip_check = True
 
 exts_list = [
     ('tifffile', '2023.9.26', {

diff --git a/easybuild/easyconfigs/c/cryoCARE/cryoCARE-0.3.0-foss-2022a-CUDA-11.7.0.eb b/easybuild/easyconfigs/c/cryoCARE/cryoCARE-0.3.0-foss-2022a-CUDA-11.7.0.eb
@@ -35,8 +35,6 @@ dependencies = [
     ('CSBDeep', '0.7.4', versionsuffix),
 ]
 
-use_pip = True
-sanity_pip_check = True
 
 exts_list = [
     (name, version, {

diff --git a/easybuild/easyconfigs/d/DeltaLake/DeltaLake-0.15.1-gfbf-2023a.eb b/easybuild/easyconfigs/d/DeltaLake/DeltaLake-0.15.1-gfbf-2023a.eb
@@ -865,9 +865,6 @@ dependencies = [
     ('Arrow', '14.0.1'),
 ]
 
-use_pip = True
 use_pip_extras = "pandas"
-sanity_pip_check = True
-download_dep_fail = True
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/e/edlib/edlib-1.3.9-GCC-12.3.0.eb b/easybuild/easyconfigs/e/edlib/edlib-1.3.9-GCC-12.3.0.eb
@@ -13,8 +13,6 @@ dependencies = [
     ('Python-bundle-PyPI', '2023.06'),
 ]
 
-use_pip = True
-sanity_pip_check = True
 
 exts_list = [
     ('cogapp', '3.3.0', {

diff --git a/easybuild/easyconfigs/f/FFAVES/FFAVES-2022.11.1-foss-2022a.eb b/easybuild/easyconfigs/f/FFAVES/FFAVES-2022.11.1-foss-2022a.eb
@@ -21,8 +21,6 @@ dependencies = [
     ('SciPy-bundle', '2022.05'),
 ]
 
-use_pip = True
-sanity_pip_check = True
 
 exts_list = [
     ('dill', '0.3.8', {

diff --git a/easybuild/easyconfigs/l/libxml2-python/libxml2-python-2.11.4-GCCcore-12.3.0.eb b/easybuild/easyconfigs/l/libxml2-python/libxml2-python-2.11.4-GCCcore-12.3.0.eb
@@ -38,9 +38,6 @@ start_dir = 'python'
 # need to run a configure first, since there is only a setup.py.in
 preinstallopts = 'cd .. && ./configure --prefix=%(installdir)s && cd python && '
 
-use_pip = True
-download_dep_fail = True
-sanity_pip_check = True
 
 sanity_check_paths = {
     'files': [],

diff --git a/easybuild/easyconfigs/o/ont-fast5-api/ont-fast5-api-4.1.2-foss-2023a.eb b/easybuild/easyconfigs/o/ont-fast5-api/ont-fast5-api-4.1.2-foss-2023a.eb
@@ -14,7 +14,6 @@ dependencies = [
     ('h5py', '3.9.0'),
 ]
 
-use_pip = True
 
 exts_list = [
     ('progressbar33', '2.4', {
@@ -43,6 +42,5 @@ sanity_check_commands = [
     "single_to_multi_fast5 --help",
 ]
 
-sanity_pip_check = True
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/phyluce/phyluce-1.7.3-foss-2023a.eb b/easybuild/easyconfigs/p/phyluce/phyluce-1.7.3-foss-2023a.eb
@@ -57,8 +57,6 @@ exts_list = [
     }),
 ]
 
-use_pip = True
-sanity_pip_check = True
 
 sanity_check_paths = {
     'files': [],

diff --git a/easybuild/easyconfigs/p/pyfaidx/pyfaidx-0.8.1.1-GCCcore-12.3.0.eb b/easybuild/easyconfigs/p/pyfaidx/pyfaidx-0.8.1.1-GCCcore-12.3.0.eb
@@ -14,8 +14,6 @@ builddependencies = [
 
 dependencies = [('Python', '3.11.3')]
 
-sanity_pip_check = True
-use_pip = True
 
 exts_list = [
     ('zipp', '3.17.0', {

diff --git a/easybuild/easyconfigs/p/pyspoa/pyspoa-0.2.1-GCC-12.3.0.eb b/easybuild/easyconfigs/p/pyspoa/pyspoa-0.2.1-GCC-12.3.0.eb
@@ -46,9 +46,6 @@ dependencies = [
     ('spoa', '4.1.0'),
 ]
 
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
 
 preinstallopts = "mkdir -p src/vendor/cereal && ln -s %(builddir)s/cereal-*/include src/vendor/cereal/include && "
 # strip out cmake requirements, since we provide that as proper dependency

diff --git a/easybuild/easyconfigs/p/python-parasail/python-parasail-1.3.4-foss-2023a.eb b/easybuild/easyconfigs/p/python-parasail/python-parasail-1.3.4-foss-2023a.eb
@@ -20,9 +20,6 @@ dependencies = [
     ('SciPy-bundle', '2023.07'),
 ]
 
-download_dep_fail = True
-use_pip = True
-sanity_pip_check = True
 
 # make sure setup.py finds the parasail library
 preinstallopts = "ln -s $EBROOTPARASAIL/lib/libparasail.so parasail/libparasail.%s && " % SHLIB_EXT

diff --git a/easybuild/easyconfigs/w/WhatsHap/WhatsHap-2.2-foss-2023a.eb b/easybuild/easyconfigs/w/WhatsHap/WhatsHap-2.2-foss-2023a.eb
@@ -23,8 +23,6 @@ dependencies = [
     ('python-isal', '1.1.0'),
 ]
 
-sanity_pip_check = True
-use_pip = True
 
 exts_list = [
     ('xopen', '1.7.0', {

diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py
@@ -1417,6 +1417,27 @@ def template_easyconfig_test(self, spec):
 
     self.assertFalse(redefined_keys, redefined_keys_error_msg)
 
+    # make sure that download_dep_fail, use_pip, sanity_pip_check are not explicitly enabled,
+    # since they are enabled by default now in PythonPackage easyblock
+    patterns = [
+        # top-level easyconfig parameters
+        """^download_dep_fail = True""",
+        """^sanity_pip_check = True""",
+        """^use_pip = True""",
+        # for specific extensions, or in exts_default_options
+        """["']download_dep_fail["']: True""",
+        """["']sanity_pip_check["']: True""",
+        """["']use_pip["']: True""",
+    ]
+    hits = []
+    for pattern in patterns:
+        regex = re.compile(pattern, re.M)
+        hits += regex.findall(ec.rawtxt)
+
+    error_msg = "download_dep_fail, sanity_pip_check, use_pip should not be set to True "
+    error_msg += "(already enabled by default in PythonPackage easyblock)"
+    self.assertFalse(hits, error_msg)
+
     # make sure old GitHub urls for EasyBuild that include 'hpcugent' are no longer used
     old_urls = [
         'github.com/hpcugent/easybuild',