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

retain custom easyconfig parameters supported by MesonNinja easyblock in custom easyblock for scipy #3526

Merged
merged 1 commit into from
Dec 11, 2024
Merged
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
8 changes: 5 additions & 3 deletions easybuild/easyblocks/s/scipy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down