From b3989bd9d5e1c81ca155da2f16d314030ce173af Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Wed, 22 Jan 2025 17:48:05 +0100 Subject: [PATCH 1/4] Export the temporary installdir as env var so that it may be used in EasyCOnfigs. Needed by e.g. Astropy, that requires the tests to be ran in the installdir --- easybuild/easyblocks/generic/pythonpackage.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easybuild/easyblocks/generic/pythonpackage.py b/easybuild/easyblocks/generic/pythonpackage.py index eae50cae7c..113483a608 100644 --- a/easybuild/easyblocks/generic/pythonpackage.py +++ b/easybuild/easyblocks/generic/pythonpackage.py @@ -851,6 +851,9 @@ def test_step(self, return_output_ec=False): actual_installdir = os.path.join(test_installdir, 'local') else: actual_installdir = test_installdir + # Export the temporary installdir as an environment variable + # Some tests (e.g. for astropy) require to be run in the installdir + env.setvar('EB_TEST_INSTALLDIR', actual_installdir) self.log.debug("Pre-creating subdirectories in %s: %s", actual_installdir, self.all_pylibdirs) for pylibdir in self.all_pylibdirs: From fddee023c86d1299098c7826925f1c3e60678782 Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Fri, 31 Jan 2025 03:19:54 +0100 Subject: [PATCH 2/4] Change name of env var --- easybuild/easyblocks/generic/pythonpackage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyblocks/generic/pythonpackage.py b/easybuild/easyblocks/generic/pythonpackage.py index 113483a608..f27ace5f22 100644 --- a/easybuild/easyblocks/generic/pythonpackage.py +++ b/easybuild/easyblocks/generic/pythonpackage.py @@ -853,7 +853,7 @@ def test_step(self, return_output_ec=False): actual_installdir = test_installdir # Export the temporary installdir as an environment variable # Some tests (e.g. for astropy) require to be run in the installdir - env.setvar('EB_TEST_INSTALLDIR', actual_installdir) + env.setvar('EB_PYTHONPACKAGE_TEST_INSTALLDIR', actual_installdir) self.log.debug("Pre-creating subdirectories in %s: %s", actual_installdir, self.all_pylibdirs) for pylibdir in self.all_pylibdirs: From 43aaf615bf2e962988527ac085ba38d5ed28111a Mon Sep 17 00:00:00 2001 From: Samuel Moors Date: Fri, 7 Feb 2025 09:30:25 +0100 Subject: [PATCH 3/4] allow installing from commit for LAMMPS --- easybuild/easyblocks/l/lammps.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyblocks/l/lammps.py b/easybuild/easyblocks/l/lammps.py index c3459720ff..60e8fb7a45 100644 --- a/easybuild/easyblocks/l/lammps.py +++ b/easybuild/easyblocks/l/lammps.py @@ -480,7 +480,8 @@ def install_step(self): mkdir(site_packages, parents=True) - self.lammpsdir = os.path.join(self.builddir, '%s-*_%s' % (self.name.lower(), self.version)) + # self.lammpsdir = os.path.join(self.builddir, '%s-*_%s' % (self.name.lower(), self.version)) + self.lammpsdir = os.path.join(self.builddir, '%s-*' % self.name.lower()) self.python_dir = os.path.join(self.lammpsdir, 'python') # The -i flag is added through a patch to the lammps source file python/install.py From b9bb80f61bd88dfb73e7374fa90ea26b6f27a51d Mon Sep 17 00:00:00 2001 From: Samuel Moors Date: Fri, 7 Feb 2025 09:31:26 +0100 Subject: [PATCH 4/4] remove comment --- easybuild/easyblocks/l/lammps.py | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyblocks/l/lammps.py b/easybuild/easyblocks/l/lammps.py index 60e8fb7a45..28ff5fa4c6 100644 --- a/easybuild/easyblocks/l/lammps.py +++ b/easybuild/easyblocks/l/lammps.py @@ -480,7 +480,6 @@ def install_step(self): mkdir(site_packages, parents=True) - # self.lammpsdir = os.path.join(self.builddir, '%s-*_%s' % (self.name.lower(), self.version)) self.lammpsdir = os.path.join(self.builddir, '%s-*' % self.name.lower()) self.python_dir = os.path.join(self.lammpsdir, 'python')