From ddecf070454c3440c3342ab92f067b71c52a8336 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 2 Feb 2023 06:07:25 +0100 Subject: Use the `maintainers` directive in all packages (#35201) --- lib/spack/spack/test/cmd/maintainers.py | 6 ++++++ lib/spack/spack/test/directives.py | 2 +- lib/spack/spack/test/util/package_hash.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/test/cmd/maintainers.py b/lib/spack/spack/test/cmd/maintainers.py index fba42bfc8e..2c9393ef28 100644 --- a/lib/spack/spack/test/cmd/maintainers.py +++ b/lib/spack/spack/test/cmd/maintainers.py @@ -49,6 +49,8 @@ def test_all(mock_packages, capfd): "user2,", "user3", "py-extension1:", + "adamjstewart,", + "pradyunsg,", "user1,", "user2", ] @@ -66,6 +68,10 @@ def test_all_by_user(mock_packages, capfd): with capfd.disabled(): out = split(maintainers("--all", "--by-user")) assert out == [ + "adamjstewart:", + "py-extension1", + "pradyunsg:", + "py-extension1", "user0:", "maintainers-3", "user1:", diff --git a/lib/spack/spack/test/directives.py b/lib/spack/spack/test/directives.py index 18242feb67..40bbd08d8b 100644 --- a/lib/spack/spack/test/directives.py +++ b/lib/spack/spack/test/directives.py @@ -76,7 +76,7 @@ def test_error_on_anonymous_dependency(config, mock_packages): [ ("maintainers-1", ["user1", "user2"]), # Reset from PythonPackage - ("py-extension1", ["user1", "user2"]), + ("py-extension1", ["adamjstewart", "pradyunsg", "user1", "user2"]), # Extends maintainers-1 ("maintainers-3", ["user0", "user1", "user2", "user3"]), ], diff --git a/lib/spack/spack/test/util/package_hash.py b/lib/spack/spack/test/util/package_hash.py index ce0f238c87..331e2c4989 100644 --- a/lib/spack/spack/test/util/package_hash.py +++ b/lib/spack/spack/test/util/package_hash.py @@ -238,7 +238,7 @@ class HasManyMetadataAttributes: url = "https://example.com/foo.tar.gz" git = "https://example.com/foo/bar.git" - maintainers = ["alice", "bob"] + maintainers("alice", "bob") tags = ["foo", "bar", "baz"] depends_on("foo") -- cgit v1.2.3-60-g2f50