Skip to content

Commit

Permalink
removed the hook and added --from-pr
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Top committed Feb 28, 2024
1 parent 68a766f commit 3cdf803
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,7 @@ easyconfigs:
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/19554
options:
from-pr: 19554
- dask-2023.9.2-foss-2023a.eb
- dask-2023.9.2-foss-2023a.eb:
options:
from-pr: 19996

14 changes: 0 additions & 14 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,19 +204,6 @@ def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
raise EasyBuildError("OpenBLAS-specific hook triggered for non-OpenBLAS easyconfig?!")


def parse_hook_Pillow_SIMD_harcoded_paths(ec, eprefix):
"""Make Pillow-SIMD aware of sysroot."""
# patch setup.py to prefix hardcoded /usr/* and /lib paths with value of %(sysroot) template
# (which will be empty if EasyBuild is not configured to use an alternate sysroot);
# see also https://gitlab.com/eessi/support/-/issues/9
if ec.name == 'Pillow-SIMD':
ec.update('preinstallopts', """sed -i 's@"/usr/@"%(sysroot)s/usr/@g' setup.py && """)
ec.update('preinstallopts', """sed -i 's@"/lib@"%(sysroot)s/lib@g' setup.py && """)
print_msg("Using custom configure options for %s: %s", ec.name, ec['preinstallopts'])
else:
raise EasyBuildError("Pillow-SIMD-specific hook triggered for non-Pillow-SIMD easyconfig?!")


def parse_hook_pybind11_replace_catch2(ec, eprefix):
"""
Replace Catch2 build dependency in pybind11 easyconfigs with one that doesn't use system toolchain.
Expand Down Expand Up @@ -595,7 +582,6 @@ def inject_gpu_property(ec):
'CGAL': parse_hook_cgal_toolchainopts_precise,
'fontconfig': parse_hook_fontconfig_add_fonts,
'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,
'Pillow-SIMD' : parse_hook_Pillow_SIMD_harcoded_paths,
'pybind11': parse_hook_pybind11_replace_catch2,
'Qt5': parse_hook_qt5_check_qtwebengine_disable,
'UCX': parse_hook_ucx_eprefix,
Expand Down

0 comments on commit 3cdf803

Please sign in to comment.