Skip to content

update scipy easyblock to copy PKG-INFO to scipy-<version>.egg-info when installing with Meson/Ninja + add sanity check command using 'pip list' #2903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
branfosj merged 2 commits into from
Mar 10, 2023
Merged

update scipy easyblock to copy PKG-INFO to scipy-<version>.egg-info when installing with Meson/Ninja + add sanity check command using 'pip list' #2903

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de55fd4
update scipy easyblock to copy PKG-INFO to scipy-<version>.egg-info w…
boegel Mar 9, 2023
bd9e693
correct directory to find PKG-INFO and improve sanity check test
branfosj Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions easybuild/easyblocks/s/scipy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
from easybuild.easyblocks.generic.mesonninja import MesonNinja
from easybuild.easyblocks.generic.pythonpackage import PythonPackage, det_pylibdir
from easybuild.framework.easyconfig import CUSTOM
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.filetools import change_dir, copy_dir
from easybuild.tools.build_log import EasyBuildError, print_warning
from easybuild.tools.filetools import change_dir, copy_dir, copy_file


class EB_scipy(FortranPythonPackage, PythonPackage, MesonNinja):
Expand Down Expand Up @@ -198,6 +198,18 @@ def install_step(self):
"""Custom install step for scipy: use ninja for scipy >= 1.9.0"""
if self.use_meson:
MesonNinja.install_step(self)

# copy PKG-INFO file included in scipy source tarball to scipy-<version>.egg-info in installation,
# so pip is aware of the scipy installation (required for 'pip list', 'pip check', etc.);
# see also https://github.com/easybuilders/easybuild-easyblocks/issues/2901
pkg_info = os.path.join(self.cfg['start_dir'], 'PKG-INFO')
target_egg_info = os.path.join(self.installdir, self.pylibdir, 'scipy-%s.egg-info' % self.version)
if os.path.isfile(pkg_info):
copy_file(pkg_info, target_egg_info)
else:
cwd = os.getcwd()
print_warning("%s not found in %s, so can't use it to create %s!", pkg_info, cwd, target_egg_info,
log=self.log)
else:
FortranPythonPackage.install_step(self)

Expand All @@ -211,4 +223,9 @@ def sanity_check_step(self, *args, **kwargs):
'dirs': [det_pylibdir()],
}

return PythonPackage.sanity_check_step(self, custom_paths=custom_paths)
# make sure that scipy is included in output of 'pip list',
# so that 'pip check' passes if scipy is a required dependency for another Python package;
# use case-insensitive match, since name is sometimes reported as 'SciPy'
custom_commands = [r"pip list | grep -iE '^scipy\s+%s\s*$'" % self.version.replace('.', r'\.')]

return PythonPackage.sanity_check_step(self, custom_paths=custom_paths, custom_commands=custom_commands)