zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

directives: don't include Optional in PatchesType

Browse Source 
`Optional` shouldn't be part of `PatchesType` -- it's clearer to specify `Optional` it
in the methods that need their arguments to be optional.

Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>
This commit is contained in:
Todd Gamblin 2024-11-29 19:08:58 -08:00
parent 6aafefd43d
commit aa81d59958
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/directives.py
View File

@ -82,7 +82,7 @@ class OpenMpi(Package):
DepType = Union[Tuple[str, ...], str] DepType = Union[Tuple[str, ...], str]
WhenType = Optional[Union[spack.spec.Spec, str, bool]] WhenType = Optional[Union[spack.spec.Spec, str, bool]]
Patcher = Callable[[Union[spack.package_base.PackageBase, Dependency]], None] Patcher = Callable[[Union[spack.package_base.PackageBase, Dependency]], None]
PatchesType = Optional[Union[Patcher, str, List[Union[Patcher, str]]]] PatchesType = Union[Patcher, str, List[Union[Patcher, str]]]
SUPPORTED_LANGUAGES = ("fortran", "cxx", "c") SUPPORTED_LANGUAGES = ("fortran", "cxx", "c")
@ -254,7 +254,7 @@ def _depends_on(
*, *,
when: WhenType = None, when: WhenType = None,
type: DepType = dt.DEFAULT_TYPES, type: DepType = dt.DEFAULT_TYPES,
patches: PatchesType = None, patches: Optional[PatchesType] = None,
): ):
when_spec = _make_when_spec(when) when_spec = _make_when_spec(when)
if not when_spec: if not when_spec:
@ -348,7 +348,7 @@ def depends_on(
spec: SpecType, spec: SpecType,
when: WhenType = None, when: WhenType = None,
type: DepType = dt.DEFAULT_TYPES, type: DepType = dt.DEFAULT_TYPES,
patches: PatchesType = None, patches: Optional[PatchesType] = None,
): ):
"""Creates a dict of deps with specs defining when they apply. """Creates a dict of deps with specs defining when they apply.