From 8c30f6ba11b500b69776d98447216008d14b67c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20=C3=96hman?= <micketeer@gmail.com>
Date: Fri, 22 Nov 2024 16:53:36 +0100
Subject: [PATCH 1/3] Move sitecustomize.py into site-packages

---
 easybuild/easyblocks/p/python.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/easybuild/easyblocks/p/python.py b/easybuild/easyblocks/p/python.py
index 01355b23e5..f7372845a8 100644
--- a/easybuild/easyblocks/p/python.py
+++ b/easybuild/easyblocks/p/python.py
@@ -142,9 +142,6 @@ def __init__(self, *args, **kwargs):
 
         self.pyshortver = '.'.join(self.version.split('.')[:2])
 
-        # Used for EBPYTHONPREFIXES handler script
-        self.pythonpath = os.path.join(log_path(), 'python')
-
         ext_defaults = {
             # Use PYPI_SOURCE as the default for source_urls of extensions.
             'source_urls': [PYPI_SOURCE],
@@ -504,7 +501,8 @@ def install_step(self):
                 symlink('pip' + self.pyshortver, pip_binary_path, use_abspath_source=False)
 
         if self.cfg.get('ebpythonprefixes'):
-            write_file(os.path.join(self.installdir, self.pythonpath, 'sitecustomize.py'), SITECUSTOMIZE)
+            site_packages_path = os.path.join('lib', 'python' + self.pyshortver, 'site-packages')
+            write_file(os.path.join(self.installdir, site_packages_path, 'sitecustomize.py'), SITECUSTOMIZE)
 
         # symlink lib/python*/lib-dynload to lib64/python*/lib-dynload if it doesn't exist;
         # see https://github.com/easybuilders/easybuild-easyblocks/issues/1957
@@ -640,7 +638,16 @@ def make_module_extra(self, *args, **kwargs):
         """Add path to sitecustomize.py to $PYTHONPATH"""
         txt = super(EB_Python, self).make_module_extra()
 
+        # Legacy support for existing installations doing "--rebuild --module-only"
         if self.cfg.get('ebpythonprefixes'):
-            txt += self.module_generator.prepend_paths(PYTHONPATH, self.pythonpath)
+            new_dir = os.path.join('lib', 'python' + self.pyshortver, 'site-packages')
+            old_dir = os.path.join(log_path(), 'python')
+            if not os.path.exists(os.path.join(self.installdir, new_dir, 'sitecustomize.py')):
+                if not os.path.exists(os.path.join(self.installdir, old_dir, 'sitecustomize.py')):
+                    raise EasyBuildError("sitecustomize.py is missing from installation.")
+                else:
+                    txt += self.module_generator.prepend_paths(PYTHONPATH, os.path.join(self.installdir, old_dir))
+
+
 
         return txt

From f573a3978502e315554a097f68833fa53ca6adf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20=C3=96hman?= <micketeer@gmail.com>
Date: Fri, 22 Nov 2024 17:45:42 +0100
Subject: [PATCH 2/3] Remove error since it breaks CI

---
 easybuild/easyblocks/p/python.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/easybuild/easyblocks/p/python.py b/easybuild/easyblocks/p/python.py
index f7372845a8..f4f66dfbb8 100644
--- a/easybuild/easyblocks/p/python.py
+++ b/easybuild/easyblocks/p/python.py
@@ -643,11 +643,6 @@ def make_module_extra(self, *args, **kwargs):
             new_dir = os.path.join('lib', 'python' + self.pyshortver, 'site-packages')
             old_dir = os.path.join(log_path(), 'python')
             if not os.path.exists(os.path.join(self.installdir, new_dir, 'sitecustomize.py')):
-                if not os.path.exists(os.path.join(self.installdir, old_dir, 'sitecustomize.py')):
-                    raise EasyBuildError("sitecustomize.py is missing from installation.")
-                else:
-                    txt += self.module_generator.prepend_paths(PYTHONPATH, os.path.join(self.installdir, old_dir))
-
-
+                txt += self.module_generator.prepend_paths(PYTHONPATH, os.path.join(self.installdir, old_dir))
 
         return txt

From db0e35b05346ab964182121e71fee220ba7c6157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20=C3=96hman?= <micketeer@gmail.com>
Date: Fri, 22 Nov 2024 17:51:03 +0100
Subject: [PATCH 3/3] Fix using relative path

---
 easybuild/easyblocks/p/python.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easybuild/easyblocks/p/python.py b/easybuild/easyblocks/p/python.py
index f4f66dfbb8..0d2b61d106 100644
--- a/easybuild/easyblocks/p/python.py
+++ b/easybuild/easyblocks/p/python.py
@@ -643,6 +643,6 @@ def make_module_extra(self, *args, **kwargs):
             new_dir = os.path.join('lib', 'python' + self.pyshortver, 'site-packages')
             old_dir = os.path.join(log_path(), 'python')
             if not os.path.exists(os.path.join(self.installdir, new_dir, 'sitecustomize.py')):
-                txt += self.module_generator.prepend_paths(PYTHONPATH, os.path.join(self.installdir, old_dir))
+                txt += self.module_generator.prepend_paths(PYTHONPATH, old_dir)
 
         return txt