From b2e7ee76dece149bc7881043b07c30df8962b4a1 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Wed, 18 Dec 2024 15:44:38 +0100
Subject: [PATCH] don't use `modextrapaths` to update `$PYTHONPATH` with
 standard path to installed Python packages
 (`lib/python%(pyshortver)s/site-packages`)

---
 easybuild/easyconfigs/a/Arrow/Arrow-17.0.0-gfbf-2024a.eb     | 2 --
 .../b/BindCraft/BindCraft-1.1.0-foss-2023a-CUDA-12.1.1.eb    | 5 +----
 .../easyconfigs/b/BindCraft/BindCraft-1.1.0-foss-2023a.eb    | 5 +----
 easybuild/easyconfigs/c/CPPE/CPPE-0.3.1-GCC-12.3.0.eb        | 2 --
 .../c/Cellformer/Cellformer-20240917-foss-2023a-R-4.3.2.eb   | 5 +----
 easybuild/easyconfigs/g/GDAL/GDAL-3.10.0-foss-2024a.eb       | 2 --
 easybuild/easyconfigs/g/GROMACS/GROMACS-2023.4-foss-2023a.eb | 4 ----
 .../GROMACS-2024.4-foss-2023b-CUDA-12.4.0-PLUMED-2.9.2.eb    | 4 ----
 .../g/GROMACS/GROMACS-2024.4-foss-2023b-CUDA-12.4.0.eb       | 4 ----
 .../g/GROMACS/GROMACS-2024.4-foss-2023b-PLUMED-2.9.2.eb      | 4 ----
 easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b.eb | 4 ----
 easybuild/easyconfigs/p/Parsnp/Parsnp-2.1.1-foss-2023b.eb    | 4 ----
 easybuild/easyconfigs/p/PySCF/PySCF-2.7.0-foss-2023a.eb      | 2 --
 .../p/pyWannier90/pyWannier90-2024-01-28-foss-2023a.eb       | 2 --
 14 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/easybuild/easyconfigs/a/Arrow/Arrow-17.0.0-gfbf-2024a.eb b/easybuild/easyconfigs/a/Arrow/Arrow-17.0.0-gfbf-2024a.eb
index 0ea40e5c9a0..a32b24582c4 100644
--- a/easybuild/easyconfigs/a/Arrow/Arrow-17.0.0-gfbf-2024a.eb
+++ b/easybuild/easyconfigs/a/Arrow/Arrow-17.0.0-gfbf-2024a.eb
@@ -75,8 +75,6 @@ exts_list = [
     }),
 ]
 
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
-
 sanity_check_paths = {
     'files': ['lib/libarrow.a', 'lib/libarrow.%s' % SHLIB_EXT,
               'lib/python%%(pyshortver)s/site-packages/pyarrow/libarrow_python.%s' % SHLIB_EXT],
diff --git a/easybuild/easyconfigs/b/BindCraft/BindCraft-1.1.0-foss-2023a-CUDA-12.1.1.eb b/easybuild/easyconfigs/b/BindCraft/BindCraft-1.1.0-foss-2023a-CUDA-12.1.1.eb
index daadf9fdcf4..516b87a169f 100644
--- a/easybuild/easyconfigs/b/BindCraft/BindCraft-1.1.0-foss-2023a-CUDA-12.1.1.eb
+++ b/easybuild/easyconfigs/b/BindCraft/BindCraft-1.1.0-foss-2023a-CUDA-12.1.1.eb
@@ -76,10 +76,7 @@ fix_python_shebang_for = ['bindcraft.py']
 
 postinstallcmds = ['chmod a+x %(installdir)s/bindcraft.py']
 
-modextrapaths = {
-    'PATH': '',
-    'PYTHONPATH': ['', 'lib/python%(pyshortver)s/site-packages'],
-}
+modextrapaths = {'PATH': ''}
 
 sanity_check_paths = {
     'files': ['bindcraft.py'],
diff --git a/easybuild/easyconfigs/b/BindCraft/BindCraft-1.1.0-foss-2023a.eb b/easybuild/easyconfigs/b/BindCraft/BindCraft-1.1.0-foss-2023a.eb
index b73bf3ed8c4..5f052a99aeb 100644
--- a/easybuild/easyconfigs/b/BindCraft/BindCraft-1.1.0-foss-2023a.eb
+++ b/easybuild/easyconfigs/b/BindCraft/BindCraft-1.1.0-foss-2023a.eb
@@ -74,10 +74,7 @@ fix_python_shebang_for = ['bindcraft.py']
 
 postinstallcmds = ['chmod a+x %(installdir)s/bindcraft.py']
 
-modextrapaths = {
-    'PATH': '',
-    'PYTHONPATH': ['', 'lib/python%(pyshortver)s/site-packages'],
-}
+modextrapaths = {'PATH': ''}
 
 sanity_check_paths = {
     'files': ['bindcraft.py'],
diff --git a/easybuild/easyconfigs/c/CPPE/CPPE-0.3.1-GCC-12.3.0.eb b/easybuild/easyconfigs/c/CPPE/CPPE-0.3.1-GCC-12.3.0.eb
index 1b1b8a94743..9fb0165f43b 100644
--- a/easybuild/easyconfigs/c/CPPE/CPPE-0.3.1-GCC-12.3.0.eb
+++ b/easybuild/easyconfigs/c/CPPE/CPPE-0.3.1-GCC-12.3.0.eb
@@ -41,6 +41,4 @@ sanity_check_paths = {
     'dirs': ['include/cppe', 'lib/python%(pyshortver)s/site-packages', 'share/cmake'],
 }
 
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
-
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/Cellformer/Cellformer-20240917-foss-2023a-R-4.3.2.eb b/easybuild/easyconfigs/c/Cellformer/Cellformer-20240917-foss-2023a-R-4.3.2.eb
index b87ac02c901..7cf1b554f0d 100644
--- a/easybuild/easyconfigs/c/Cellformer/Cellformer-20240917-foss-2023a-R-4.3.2.eb
+++ b/easybuild/easyconfigs/c/Cellformer/Cellformer-20240917-foss-2023a-R-4.3.2.eb
@@ -150,10 +150,7 @@ exts_list = [
     }),
 ]
 
-modextrapaths = {
-    'PATH': '',
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-}
+modextrapaths = {'PATH': ''}
 
 fix_python_shebang_for = [
     'src/*/*.py',
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.10.0-foss-2024a.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.10.0-foss-2024a.eb
index c84c253b59e..131e1fcc81b 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-3.10.0-foss-2024a.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.10.0-foss-2024a.eb
@@ -76,6 +76,4 @@ sanity_check_paths = {
 
 sanity_check_commands = ["python -c 'import osgeo.%(namelower)s'"]
 
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
-
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-2023.4-foss-2023a.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-2023.4-foss-2023a.eb
index 8b7c294b514..074ac41c006 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-2023.4-foss-2023a.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-2023.4-foss-2023a.eb
@@ -77,8 +77,4 @@ exts_list = [
     }),
 ]
 
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-}
-
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-CUDA-12.4.0-PLUMED-2.9.2.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-CUDA-12.4.0-PLUMED-2.9.2.eb
index d09a2bf2105..dc77aa29148 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-CUDA-12.4.0-PLUMED-2.9.2.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-CUDA-12.4.0-PLUMED-2.9.2.eb
@@ -88,8 +88,4 @@ exts_list = [
     }),
 ]
 
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-}
-
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-CUDA-12.4.0.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-CUDA-12.4.0.eb
index 73e045c97f4..4499ff224d1 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-CUDA-12.4.0.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-CUDA-12.4.0.eb
@@ -81,8 +81,4 @@ exts_list = [
     }),
 ]
 
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-}
-
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-PLUMED-2.9.2.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-PLUMED-2.9.2.eb
index 3bc47150222..9a950353a4b 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-PLUMED-2.9.2.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b-PLUMED-2.9.2.eb
@@ -87,8 +87,4 @@ exts_list = [
     }),
 ]
 
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-}
-
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b.eb
index 19d48636963..cf8db688eaf 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-2024.4-foss-2023b.eb
@@ -79,8 +79,4 @@ exts_list = [
     }),
 ]
 
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-}
-
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/Parsnp/Parsnp-2.1.1-foss-2023b.eb b/easybuild/easyconfigs/p/Parsnp/Parsnp-2.1.1-foss-2023b.eb
index fe8537ddca9..3dc97f84c49 100644
--- a/easybuild/easyconfigs/p/Parsnp/Parsnp-2.1.1-foss-2023b.eb
+++ b/easybuild/easyconfigs/p/Parsnp/Parsnp-2.1.1-foss-2023b.eb
@@ -81,8 +81,4 @@ modextravars = {
     'PARSNPDIR': '',
 }
 
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
-}
-
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PySCF/PySCF-2.7.0-foss-2023a.eb b/easybuild/easyconfigs/p/PySCF/PySCF-2.7.0-foss-2023a.eb
index 54f58334f68..32dac3ec5e7 100644
--- a/easybuild/easyconfigs/p/PySCF/PySCF-2.7.0-foss-2023a.eb
+++ b/easybuild/easyconfigs/p/PySCF/PySCF-2.7.0-foss-2023a.eb
@@ -131,6 +131,4 @@ sanity_check_paths = {
 
 sanity_check_commands = ["python -c 'import pyscf'"]
 
-modextrapaths = {'PYTHONPATH': _py_site_packages}
-
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/pyWannier90/pyWannier90-2024-01-28-foss-2023a.eb b/easybuild/easyconfigs/p/pyWannier90/pyWannier90-2024-01-28-foss-2023a.eb
index 89191292693..eb9e8a3b1b4 100644
--- a/easybuild/easyconfigs/p/pyWannier90/pyWannier90-2024-01-28-foss-2023a.eb
+++ b/easybuild/easyconfigs/p/pyWannier90/pyWannier90-2024-01-28-foss-2023a.eb
@@ -68,6 +68,4 @@ sanity_check_commands = [
     "python -c 'import pywannier90'",
 ]
 
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
-
 moduleclass = 'chem'