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

package.py: dataclasses instead of module level globals

Browse Source
This commit is contained in:
Harmen Stoppels 2025-05-12 12:16:10 +02:00 committed by Harmen Stoppels
parent f675130fe9
commit 01e576d013
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/spack/spack/build_environment.py
View File

@ -1573,9 +1573,31 @@ class ModuleChangePropagator:
def __init__(self, package: spack.package_base.PackageBase) -> None: def __init__(self, package: spack.package_base.PackageBase) -> None:
self._set_self_attributes("package", package) self._set_self_attributes("package", package)
self._set_self_attributes("current_module", package.module) self._set_self_attributes("current_module", package.module)
self._set_self_attributes("_set_attributes", {})
#: Modules for the classes in the MRO up to PackageBase #: Modules for the classes in the MRO up to PackageBase
modules_in_mro = [] modules_in_mro = []
# New API: the package class has a "data" annotation, which is a dataclass we instantiate
# class MyPackage(Package):
#
# class Data:
# foo: str
# bar: int
#
# data: Data
if hasattr(package, "data"):
return
for cls in package.__class__.__mro__:
if not hasattr(cls, "__annotations__") or "data" not in cls.__annotations__:
continue
setattr(package, "data", cls.__annotations__["data"]())
return
# Old API: we define globals on the package module. This is deprecated, because modules
# have a one to many relationship with package instances, and DAGs can contain multiple
# instances of the same package.
for cls in package.__class__.__mro__: for cls in package.__class__.__mro__:
module = getattr(cls, "module", None) module = getattr(cls, "module", None)
@ -1587,7 +1609,6 @@ def __init__(self, package: spack.package_base.PackageBase) -> None:
modules_in_mro.append(module) modules_in_mro.append(module)
self._set_self_attributes("modules_in_mro", modules_in_mro) self._set_self_attributes("modules_in_mro", modules_in_mro)
self._set_self_attributes("_set_attributes", {})
def _set_self_attributes(self, key, value): def _set_self_attributes(self, key, value):
super().__setattr__(key, value) super().__setattr__(key, value)
@ -1604,5 +1625,11 @@ def __setattr__(self, key, value):
self._set_attributes[key] = value self._set_attributes[key] = value
def propagate_changes_to_mro(self): def propagate_changes_to_mro(self):
# New API: update the data class of the package instance
if hasattr(self.package, "data"):
self.package.data.__dict__.update(self._set_attributes)
return
# Old API: set globals for every module in the package's MRO
for module_in_mro in self.modules_in_mro: for module_in_mro in self.modules_in_mro:
module_in_mro.__dict__.update(self._set_attributes) module_in_mro.__dict__.update(self._set_attributes)