Skip to content
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.

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

Rename post_install_step to post_processing_step #3525

Merged
merged 1 commit into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion easybuild/easyblocks/a/aedt.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def install_step(self):
])
run_shell_cmd("./Linux/AnsysEM/Disk1/InstData/setup.exe %s" % options)

def post_install_step(self):
def post_processing_step(self):
"""Disable OS check and set LC_ALL/LANG for runtime"""
if not self.subdir:
self._set_subdir()
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/a/aocc.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def install_step(self):

super(EB_AOCC, self).install_step()

def post_install_step(self):
def post_processing_step(self):
"""
For AOCC <5.0.0:
Create wrappers for the compilers to make sure compilers picks up GCCcore as GCC toolchain.
Expand Down Expand Up @@ -245,7 +245,7 @@ def post_install_step(self):

self._create_compiler_config_files(compilers_to_add_config_files)
self._create_compiler_wrappers(compilers_to_wrap)
super(EB_AOCC, self).post_install_step()
super(EB_AOCC, self).post_processing_step()

def sanity_check_step(self):
"""Custom sanity check for AOCC, based on sanity check for Clang."""
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/a/aomp.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ def configure_step(self):
# Only build selected components
self.cfg['installopts'] = 'select ' + ' '.join(components)

def post_install_step(self):
super(EB_AOMP, self).post_install_step()
def post_processing_step(self):
super(EB_AOMP, self).post_processing_step()
# The install script will create a symbolic link as the install
# directory, this creates problems for EB as it won't remove the
# symlink. To remedy this we remove the link here and rename the actual
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/c/clang.py
Original file line number Diff line number Diff line change
Expand Up @@ -612,9 +612,9 @@ def install_step(self):
except OSError as err:
raise EasyBuildError("Failed to copy static analyzer dirs to install dir: %s", err)

def post_install_step(self):
def post_processing_step(self):
"""Install python bindings."""
super(EB_Clang, self).post_install_step()
super(EB_Clang, self).post_processing_step()

# copy Python bindings here in post-install step so that it is not done more than once in multi_deps context
if self.cfg['python_bindings']:
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/crispr_dav.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __init__(self, *args, **kwargs):
super(EB_CRISPR_minus_DAV, self).__init__(*args, **kwargs)
self.cfg['extract_sources'] = True

def post_install_step(self):
def post_processing_step(self):
"""Update configuration files with correct paths to dependencies and files in installation."""

# getting paths of deps + files we will work with
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/c/cuda.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def install_step(self):
self.log.debug("Running patch %s", patch['name'])
run_shell_cmd("/bin/sh " + patch['path'] + " --accept-eula --silent --installdir=" + self.installdir)

def post_install_step(self):
def post_processing_step(self):
"""
Create wrappers for the specified host compilers, generate the appropriate stub symlinks,
and create version independent pkgconfig files
Expand Down Expand Up @@ -288,7 +288,7 @@ def create_wrapper(wrapper_name, wrapper_comp):
symlink(pc_file, link, use_abspath_source=False)
change_dir(cwd)

super(EB_CUDA, self).post_install_step()
super(EB_CUDA, self).post_processing_step()

def sanity_check_step(self):
"""Custom sanity check for CUDA."""
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/d/dualsphysics.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ def install_step(self):
]
super(EB_DualSPHysics, self).install_step()

def post_install_step(self):
def post_processing_step(self):
"""Custom post-installation step: ensure rpath is patched into binaries/libraries if configured."""
super(EB_DualSPHysics, self).post_install_step()
super(EB_DualSPHysics, self).post_processing_step()

if build_option('rpath'):
# only the compiled binary (e.g. DualSPHysics5.0CPU_linux64) is rpath'd, the precompiled libraries
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/e/easybuildmeta.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ def install_step(self):
except OSError as err:
raise EasyBuildError("Failed to install EasyBuild packages: %s", err)

def post_install_step(self):
def post_processing_step(self):
"""Remove setuptools.pth file that hard includes a system-wide (site-packages) path, if it is there."""

super(EB_EasyBuildMeta, self).post_install_step()
super(EB_EasyBuildMeta, self).post_processing_step()

setuptools_pth = os.path.join(self.installdir, self.pylibdir, 'setuptools.pth')
if os.path.exists(setuptools_pth):
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/f/fftwmpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def prepare_step(self, *args, **kwargs):
if not fftw_root:
raise EasyBuildError("Required FFTW dependency is missing!")

def post_install_step(self):
def post_processing_step(self):
"""Custom post install step for FFTW.MPI"""

# remove everything except include files that are already in non-MPI FFTW dependency.
Expand All @@ -68,7 +68,7 @@ def post_install_step(self):
glob.glob(os.path.join(self.installdir, 'lib*/pkgconfig')) +
glob.glob(os.path.join(self.installdir, 'lib*/cmake')) +
[os.path.join(self.installdir, p) for p in ['bin', 'share']])
super(EB_FFTW_period_MPI, self).post_install_step()
super(EB_FFTW_period_MPI, self).post_processing_step()

def sanity_check_step(self):
"""Custom sanity check for FFTW.MPI: check if all libraries/headers for MPI interfaces are there."""
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/g/gcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -966,11 +966,11 @@ def install_step(self, *args, **kwargs):
else:
super(EB_GCC, self).install_step(*args, **kwargs)

def post_install_step(self, *args, **kwargs):
def post_processing_step(self, *args, **kwargs):
"""
Post-processing after installation: add symlinks for cc, c++, f77, f95
"""
super(EB_GCC, self).post_install_step(*args, **kwargs)
super(EB_GCC, self).post_processing_step(*args, **kwargs)

# Add symlinks for cc/c++/f77/f95.
bindir = os.path.join(self.installdir, 'bin')
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/generic/binary.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def install_step(self):
raise EasyBuildError("Incorrect value type for install_cmds, should be list or tuple: ",
install_cmds)

def post_install_step(self):
def post_processing_step(self):
"""Copy installation to actual installation directory in case of a staged installation."""
if self.cfg.get('staged_install', False):
staged_installdir = self.installdir
Expand All @@ -145,7 +145,7 @@ def post_install_step(self):
raise EasyBuildError("Failed to move staged install from %s to %s: %s",
staged_installdir, self.installdir, err)

super(Binary, self).post_install_step()
super(Binary, self).post_processing_step()

def sanity_check_rpath(self):
"""Skip the rpath sanity check, this is binary software"""
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/generic/systemcompiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def make_module_extra(self, *args, **kwargs):
extras = super(SystemCompiler, self).make_module_extra(*args, **kwargs)
return extras

def post_install_step(self, *args, **kwargs):
def post_processing_step(self, *args, **kwargs):
"""Do nothing."""
pass

Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/generic/systemmpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def make_installdir(self, dontcreate=None):
"""Custom implementation of make installdir: do nothing, do not touch system MPI directories and files."""
pass

def post_install_step(self):
def post_processing_step(self):
"""Do nothing."""
pass

Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/h/hadoop.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def install_step(self):
else:
super(EB_Hadoop, self).install_step()

def post_install_step(self):
def post_processing_step(self):
"""After the install, copy the extra native libraries into place."""
for native_library, lib_path in self.cfg['extra_native_libs']:
lib_root = get_software_root(native_library)
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/i/imkl.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,11 @@ def build_mkl_flexiblas(self, flexiblasdir):
if res.exit_code:
raise EasyBuildError("Building FlexiBLAS-compatible library (cmd: %s) failed", cmd)

def post_install_step(self):
def post_processing_step(self):
"""
Install group libraries and interfaces (if desired).
"""
super(EB_imkl, self).post_install_step()
super(EB_imkl, self).post_processing_step()

# extract examples
examples_subdir = os.path.join(self.installdir, self.mkl_basedir, self.examples_subdir)
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/i/imkl_fftw.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ def make_module_extra(self):
# bypass extra module variables for imkl
return super(EB_imkl, self).make_module_extra()

def post_install_step(self):
def post_processing_step(self):
"""Custom post install step for imkl-FFTW"""
# bypass post_install_step of imkl easyblock
# bypass post_processing_step of imkl easyblock
pass

def sanity_check_step(self):
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/i/impi.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ def install_step(self):
else:
raise EasyBuildError("Rebuild of libfabric is requested, but ofi_internal is set to False.")

def post_install_step(self):
def post_processing_step(self):
"""Custom post install step for IMPI, fix broken env scripts after moving installed files."""
super(EB_impi, self).post_install_step()
super(EB_impi, self).post_processing_step()

impiver = LooseVersion(self.version)

Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/j/java.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ def install_step(self):
else:
PackedBinary.install_step(self)

def post_install_step(self):
def post_processing_step(self):
"""
Custom post-installation step:
- ensure correct glibc is used when installing into custom sysroot and using RPATH
"""
super(EB_Java, self).post_install_step()
super(EB_Java, self).post_processing_step()

# patch binaries and libraries when using alternate sysroot in combination with RPATH
sysroot = build_option('sysroot')
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/m/mathematica.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def install_step(self):
if orig_display is not None:
os.environ['DISPLAY'] = orig_display

def post_install_step(self):
def post_processing_step(self):
"""Activate installation by using activation key, if provided."""
if self.cfg['activation_key']:
# activation key is printed by using '$ActivationKey' in Mathematica, so no reason to keep it 'secret'
Expand All @@ -126,7 +126,7 @@ def post_install_step(self):
else:
self.log.info("No activation key provided, so skipping activation of the installation.")

super(EB_Mathematica, self).post_install_step()
super(EB_Mathematica, self).post_processing_step()

def sanity_check_step(self):
"""Custom sanity check for Mathematica."""
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/m/metagenome_atlas.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class EB_Metagenome_Atlas(PythonPackage):
Support for building/installing Metagenome-Atlas.
"""

def post_install_step(self):
def post_processing_step(self):
"""Create snakemake config files"""

# https://metagenome-atlas.readthedocs.io/en/latest/usage/getting_started.html#set-up-of-cluster-execution
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/p/perl.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def prepare_for_extensions(self):
# from specified sysroot rather than from host OS
setvar('OPENSSL_PREFIX', sysroot)

def post_install_step(self, *args, **kwargs):
def post_processing_step(self, *args, **kwargs):
"""
Custom post-installation step for Perl: avoid excessive long shebang lines in Perl scripts.
"""
Expand All @@ -177,7 +177,7 @@ def post_install_step(self, *args, **kwargs):
# specify pattern for paths (relative to install dir) of files for which shebang should be patched
self.cfg['fix_perl_shebang_for'] = 'bin/*'

super(EB_Perl, self).post_install_step(*args, **kwargs)
super(EB_Perl, self).post_processing_step(*args, **kwargs)

def sanity_check_step(self):
"""Custom sanity check for Perl."""
Expand Down