fix merge conflict after PR188

eb_hooks.py

@@ -18,6 +18,9 @@
     from distutils.version import LooseVersion
 
 
+CPU_TARGET_NEOVERSE_V1 = 'aarch64/neoverse_v1'
+
+
 EESSI_RPATH_OVERRIDE_ATTR = 'orig_rpath_override_dirs'
 
 
@@ -248,6 +251,23 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
     else:
         raise EasyBuildError("WRF-specific hook triggered for non-WRF easyconfig?!")
 
+
+def pre_test_hook(self,*args, **kwargs):
+    """Main pre-test hook: trigger custom functions based on software name."""
+    if self.name in PRE_TEST_HOOKS:
+        PRE_TEST_HOOKS[self.name](self, *args, **kwargs)
+
+
+def pre_test_hook_ignore_failing_tests_SciPybundle(self, *args, **kwargs):
+    """
+    Pre-test hook for SciPy-bundle: skip failing tests for SciPy-bundle 2021.10 (currently the only version that is failing).
+    In previous versions we were not as strict yet on the numpy/SciPy tests
+    """
+    cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
+    if self.name == 'SciPy-bundle' and self.version == '2021.10' and cpu_target == CPU_TARGET_NEOVERSE_V1:
+        self.cfg['testopts'] = "|| echo ignoring failing tests" 
+
+
 PARSE_HOOKS = {
     'CGAL': parse_hook_cgal_toolchainopts_precise,
     'fontconfig': parse_hook_fontconfig_add_fonts,
@@ -265,3 +285,7 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
     'OpenBLAS': pre_configure_hook_openblas_optarch_generic,
     'WRF': pre_configure_hook_wrf_aarch64,
 }
+
+PRE_TEST_HOOKS = {
+    'SciPy-bundle': pre_test_hook_ignore_failing_tests_SciPybundle,
+}

eessi-2023.06-eb-4.8.1-2022a.yml

@@ -15,4 +15,20 @@ easyconfigs:
       options:
         include-easyblocks-from-pr: 3012
   - NCO-5.1.0-foss-2022a.eb
+  - AdapterRemoval-2.3.3-GCC-11.3.0.eb
+  - BEDTools-2.30.0-GCC-11.3.0.eb
+  - Pysam-0.20.0-GCC-11.3.0.eb
+  - TransDecoder-5.5.0-GCC-11.3.0.eb
+  - VCFtools-0.1.16-GCC-11.3.0.eb
+  - XML-LibXML-2.0207-GCCcore-11.3.0.eb
+  - CMake-3.24.3-GCCcore-11.3.0.eb
+  - elfutils-0.187-GCCcore-11.3.0.eb
+  - Ninja-1.10.2-GCCcore-11.3.0.eb
+  - Z3-4.10.2-GCCcore-11.3.0.eb
+  - SciPy-bundle-2022.05-foss-2022a.eb
+  - Xvfb-21.1.3-GCCcore-11.3.0.eb:
+      # enable exec permissions for xvfb-run after copying;
+      # need to also enable user write permissions on xvfb-run to ensure that copying with preserved permissions works
+      options:
+        from-pr: 18834
   - tbb-2021.5.0-GCCcore-11.3.0.eb