From b1cef7e50ed0bffb7b1d0098a7e8d58ef9727a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Wed, 11 Dec 2024 01:05:52 +0100 Subject: [PATCH] Include meson ninja extra options to scipy --- easybuild/easyblocks/s/scipy.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/easybuild/easyblocks/s/scipy.py b/easybuild/easyblocks/s/scipy.py index e9860c751f..42e25926a4 100644 --- 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."""