Merge pull request #3526 from Micket/scipymeson

retain custom easyconfig parameters supported by `MesonNinja` easyblock in custom easyblock for `scipy`
easybuilders · Dec 11, 2024 · 3494f2f · 3494f2f
2 parents 6ea2af3 + b1cef7e
commit 3494f2f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/easybuild/easyblocks/s/scipy.py b/easybuild/easyblocks/s/scipy.py
@@ -51,15 +51,17 @@ class EB_scipy(FortranPythonPackage, PythonPackage, MesonNinja):
     """Support for installing the scipy Python package as part of a Python installation."""
 
     @staticmethod
-    def extra_options():
+    def extra_options(extra_vars=None):
         """Easyconfig parameters specific to scipy."""
-        extra_vars = ({
+        extra_vars = PythonPackage.extra_options(extra_vars=extra_vars)
+        extra_vars = MesonNinja.extra_options(extra_vars=extra_vars)
+        extra_vars.update({
             'enable_slow_tests': [False, "Run scipy test suite, including tests marked as slow", CUSTOM],
             'ignore_test_result': [None, "Run scipy test suite, but ignore test failures (True/False/None). Default "
                                          "(None) implies True for scipy < 1.9, and False for scipy >= 1.9", CUSTOM],
         })
 
-        return PythonPackage.extra_options(extra_vars=extra_vars)
+        return extra_vars
 
     def __init__(self, *args, **kwargs):
         """Set scipy-specific test command."""