From 52f57c90eb19e9d9b31e81aee35a25d30cbb2c2b Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 8 Mar 2024 18:29:24 +0100 Subject: Retiring as PythonPackage maintainer (#43091) --- lib/spack/spack/build_systems/python.py | 4 +--- lib/spack/spack/test/cmd/maintainers.py | 14 +------------- lib/spack/spack/test/data/unparse/py-torch.txt | 2 -- lib/spack/spack/test/directives.py | 2 +- 4 files changed, 3 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index e4f5b7619d..1f650be98a 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -27,7 +27,7 @@ import spack.multimethod import spack.package_base import spack.spec import spack.store -from spack.directives import build_system, depends_on, extends, maintainers +from spack.directives import build_system, depends_on, extends from spack.error import NoHeadersError, NoLibrariesError from spack.install_test import test_part from spack.spec import Spec @@ -56,8 +56,6 @@ def _flatten_dict(dictionary: Mapping[str, object]) -> Iterable[str]: class PythonExtension(spack.package_base.PackageBase): - maintainers("adamjstewart") - @property def import_modules(self) -> Iterable[str]: """Names of modules that the Python package provides. diff --git a/lib/spack/spack/test/cmd/maintainers.py b/lib/spack/spack/test/cmd/maintainers.py index 3534310a9d..2724d7ec83 100644 --- a/lib/spack/spack/test/cmd/maintainers.py +++ b/lib/spack/spack/test/cmd/maintainers.py @@ -12,13 +12,7 @@ import spack.repo maintainers = spack.main.SpackCommand("maintainers") -MAINTAINED_PACKAGES = [ - "maintainers-1", - "maintainers-2", - "maintainers-3", - "py-extension1", - "py-extension2", -] +MAINTAINED_PACKAGES = ["maintainers-1", "maintainers-2", "maintainers-3", "py-extension1"] def split(output): @@ -53,11 +47,8 @@ def test_all(mock_packages, capfd): "user2,", "user3", "py-extension1:", - "adamjstewart,", "user1,", "user2", - "py-extension2:", - "adamjstewart", ] with capfd.disabled(): @@ -69,9 +60,6 @@ def test_all_by_user(mock_packages, capfd): with capfd.disabled(): out = split(maintainers("--all", "--by-user")) assert out == [ - "adamjstewart:", - "py-extension1,", - "py-extension2", "user0:", "maintainers-3", "user1:", diff --git a/lib/spack/spack/test/data/unparse/py-torch.txt b/lib/spack/spack/test/data/unparse/py-torch.txt index 441d1be914..05d2d59669 100644 --- a/lib/spack/spack/test/data/unparse/py-torch.txt +++ b/lib/spack/spack/test/data/unparse/py-torch.txt @@ -24,8 +24,6 @@ class PyTorch(PythonPackage, CudaPackage): homepage = "https://pytorch.org/" git = "https://github.com/pytorch/pytorch.git" - maintainers("adamjstewart") - # Exact set of modules is version- and variant-specific, just attempt to import the # core libraries to ensure that the package was successfully installed. import_modules = ["torch", "torch.autograd", "torch.nn", "torch.utils"] diff --git a/lib/spack/spack/test/directives.py b/lib/spack/spack/test/directives.py index a878cea6f2..ca7b3b7c7a 100644 --- a/lib/spack/spack/test/directives.py +++ b/lib/spack/spack/test/directives.py @@ -79,7 +79,7 @@ def test_error_on_anonymous_dependency(config, mock_packages): [ ("maintainers-1", ["user1", "user2"]), # Extends PythonPackage - ("py-extension1", ["adamjstewart", "user1", "user2"]), + ("py-extension1", ["user1", "user2"]), # Extends maintainers-1 ("maintainers-3", ["user0", "user1", "user2", "user3"]), ], -- cgit v1.2.3-70-g09d2