Remove additional manually specified PYTHONPATH's

easybuilders · Aug 16, 2024 · c51b513 · c51b513
1 parent 07068f0
commit c51b513
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 29 deletions.
diff --git a/...easyconfigs/a/Arcade-Learning-Environment/Arcade-Learning-Environment-0.8.1-foss-2023a.eb b/...easyconfigs/a/Arcade-Learning-Environment/Arcade-Learning-Environment-0.8.1-foss-2023a.eb
@@ -55,6 +55,4 @@ sanity_check_paths = {
 
 sanity_check_commands = ["ale-import-roms --help"]
 
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/f/FSL/FSL-6.0.5.1-foss-2021a.eb b/easybuild/easyconfigs/f/FSL/FSL-6.0.5.1-foss-2021a.eb
@@ -74,7 +74,7 @@ exts_list = [
 ]
 
 modextrapaths = {
-    'PYTHONPATH': ['fsl/lib/python%(pyshortver)s/site-packages', 'lib/python%(pyshortver)s/site-packages'],
+    'PYTHONPATH': ['fsl/lib/python%(pyshortver)s/site-packages'],
 }
 
 modextravars = {

diff --git a/easybuild/easyconfigs/f/FunGAP/FunGAP-1.1.1-foss-2022a.eb b/easybuild/easyconfigs/f/FunGAP/FunGAP-1.1.1-foss-2022a.eb
@@ -89,7 +89,7 @@ sanity_check_paths = {
 
 modextrapaths = {
     'PATH': '',
-    'PYTHONPATH': ['', 'lib/python%(pyshortver)s/site-packages']
+    'PYTHONPATH': '',
 }
 
 modextravars = {

diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.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/GIMIC/GIMIC-2.2.1-foss-2022a.eb b/easybuild/easyconfigs/g/GIMIC/GIMIC-2.2.1-foss-2022a.eb
@@ -49,7 +49,7 @@ exts_list = [
 ]
 
 modextrapaths = {
-    'PYTHONPATH': ['bin/QCTools', 'lib/python%(pyshortver)s/site-packages'],
+    'PYTHONPATH': 'bin/QCTools',
 }
 
 sanity_check_paths = {

diff --git a/easybuild/easyconfigs/i/ITK/ITK-5.3.0-foss-2022b.eb b/easybuild/easyconfigs/i/ITK/ITK-5.3.0-foss-2022b.eb
@@ -73,6 +73,4 @@ sanity_check_paths = {
 
 sanity_check_commands = ["python -c 'import itk'"]
 
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
-
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/PySCF/PySCF-2.1.1-foss-2022a.eb b/easybuild/easyconfigs/p/PySCF/PySCF-2.1.1-foss-2022a.eb
@@ -134,6 +134,4 @@ sanity_check_paths = {
 
 sanity_check_commands = ["python -c 'import pyscf'"]
 
-modextrapaths = {'PYTHONPATH': _py_site_packages}
-
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PySCF/PySCF-2.4.0-foss-2022b.eb b/easybuild/easyconfigs/p/PySCF/PySCF-2.4.0-foss-2022b.eb
@@ -128,6 +128,4 @@ sanity_check_paths = {
 
 sanity_check_commands = ["python -c 'import pyscf'"]
 
-modextrapaths = {'PYTHONPATH': _py_site_packages}
-
 moduleclass = 'chem'
diff --git a/...gs/p/pytorch-CycleGAN-pix2pix/pytorch-CycleGAN-pix2pix-20230314-foss-2022a-CUDA-11.7.0.eb b/...gs/p/pytorch-CycleGAN-pix2pix/pytorch-CycleGAN-pix2pix-20230314-foss-2022a-CUDA-11.7.0.eb
@@ -54,6 +54,4 @@ sanity_check_commands = [
     'test.py --help',
 ]
 
-modextrapaths = {'PYTHONPATH': _pylib}
-
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/r/RDKit/RDKit-2024.03.3-foss-2023a.eb b/easybuild/easyconfigs/r/RDKit/RDKit-2024.03.3-foss-2023a.eb
@@ -68,6 +68,4 @@ sanity_check_commands = [
     "python -c 'import rdkit.rdBase'",
 ]
 
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
-
 moduleclass = 'chem'
diff --git a/...asyconfigs/s/SNAP-ESA-python/SNAP-ESA-python-8.0-GCCcore-10.2.0-Java-1.8-Python-2.7.18.eb b/...asyconfigs/s/SNAP-ESA-python/SNAP-ESA-python-8.0-GCCcore-10.2.0-Java-1.8-Python-2.7.18.eb
@@ -38,8 +38,6 @@ sanity_check_paths = {
 
 sanity_check_commands = ["python -c 'import snappy'"]
 
-modextrapaths = {'PYTHONPATH': [local_pysite]}
-
 local_javaopts = " -Dsnap.pythonExecutable=python"
 local_javaopts += " -Dsnap.pythonModuleDir=%s" % local_pyinstalldir
 

diff --git a/...syconfigs/s/SNAP-ESA-python/SNAP-ESA-python-9.0.0-GCCcore-11.2.0-Java-11-Python-2.7.18.eb b/...syconfigs/s/SNAP-ESA-python/SNAP-ESA-python-9.0.0-GCCcore-11.2.0-Java-11-Python-2.7.18.eb
@@ -38,8 +38,6 @@ sanity_check_paths = {
 
 sanity_check_commands = ["python -c 'import snappy'"]
 
-modextrapaths = {'PYTHONPATH': [local_pysite]}
-
 local_javaopts = " -Dsnap.pythonExecutable=python"
 local_javaopts += " -Dsnap.pythonModuleDir=%s" % local_pyinstalldir
 

diff --git a/easybuild/easyconfigs/s/SUMO/SUMO-1.7.0-foss-2020a-Python-3.8.2.eb b/easybuild/easyconfigs/s/SUMO/SUMO-1.7.0-foss-2020a-Python-3.8.2.eb
@@ -53,7 +53,6 @@ sanity_check_commands = [
 
 modextrapaths = {
     'SUMO_HOME': local_sumo_home,
-    'PYTHONPATH': local_pythonpath,
 }
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/Spark/Spark-3.1.1-foss-2020a-Python-3.8.2.eb b/easybuild/easyconfigs/s/Spark/Spark-3.1.1-foss-2020a-Python-3.8.2.eb
@@ -46,7 +46,7 @@ sanity_check_commands = [
     "python -c 'import pyspark'",
 ]
 
-modextrapaths = {'PYTHONPATH': ['python', 'lib/python%(pyshortver)s/site-packages']}
+modextrapaths = {'PYTHONPATH': 'python'}
 
 modextravars = {'SPARK_HOME': '%(installdir)s'}
 

diff --git a/easybuild/easyconfigs/s/Spark/Spark-3.1.1-foss-2020b.eb b/easybuild/easyconfigs/s/Spark/Spark-3.1.1-foss-2020b.eb
@@ -45,7 +45,7 @@ sanity_check_commands = [
     "python -c 'import pyspark'",
 ]
 
-modextrapaths = {'PYTHONPATH': ['python', 'lib/python%(pyshortver)s/site-packages']}
+modextrapaths = {'PYTHONPATH': 'python'}
 
 modextravars = {'SPARK_HOME': '%(installdir)s'}
 

diff --git a/easybuild/easyconfigs/s/Spark/Spark-3.1.1-fosscuda-2020b.eb b/easybuild/easyconfigs/s/Spark/Spark-3.1.1-fosscuda-2020b.eb
@@ -45,7 +45,7 @@ sanity_check_commands = [
     "python -c 'import pyspark'",
 ]
 
-modextrapaths = {'PYTHONPATH': ['python', 'lib/python%(pyshortver)s/site-packages']}
+modextrapaths = {'PYTHONPATH': 'python'}
 
 modextravars = {'SPARK_HOME': '%(installdir)s'}
 

diff --git a/easybuild/easyconfigs/s/Spark/Spark-3.2.1-foss-2021b.eb b/easybuild/easyconfigs/s/Spark/Spark-3.2.1-foss-2021b.eb
@@ -45,7 +45,7 @@ sanity_check_commands = [
     "python -c 'import pyspark'",
 ]
 
-modextrapaths = {'PYTHONPATH': ['python', 'lib/python%(pyshortver)s/site-packages']}
+modextrapaths = {'PYTHONPATH': 'python'}
 
 modextravars = {'SPARK_HOME': '%(installdir)s'}
 

diff --git a/easybuild/easyconfigs/s/Spark/Spark-3.3.1-foss-2022a.eb b/easybuild/easyconfigs/s/Spark/Spark-3.3.1-foss-2022a.eb
@@ -43,7 +43,7 @@ sanity_check_commands = [
     "python -c 'import pyspark'",
 ]
 
-modextrapaths = {'PYTHONPATH': ['python', 'lib/python%(pyshortver)s/site-packages']}
+modextrapaths = {'PYTHONPATH': 'python'}
 
 modextravars = {'SPARK_HOME': '%(installdir)s'}
 

diff --git a/easybuild/easyconfigs/s/Spark/Spark-3.5.0-foss-2023a.eb b/easybuild/easyconfigs/s/Spark/Spark-3.5.0-foss-2023a.eb
@@ -43,7 +43,7 @@ sanity_check_commands = [
     "python -c 'import pyspark'",
 ]
 
-modextrapaths = {'PYTHONPATH': ['python', 'lib/python%(pyshortver)s/site-packages']}
+modextrapaths = {'PYTHONPATH': 'python'}
 
 modextravars = {'SPARK_HOME': '%(installdir)s'}
 

diff --git a/easybuild/easyconfigs/s/Spark/Spark-3.5.1-foss-2023a-Java-17.eb b/easybuild/easyconfigs/s/Spark/Spark-3.5.1-foss-2023a-Java-17.eb
@@ -44,7 +44,7 @@ sanity_check_commands = [
     "python -c 'import pyspark'",
 ]
 
-modextrapaths = {'PYTHONPATH': ['python', 'lib/python%(pyshortver)s/site-packages']}
+modextrapaths = {'PYTHONPATH': 'python'}
 
 modextravars = {'SPARK_HOME': '%(installdir)s'}