spack find: remove deprecated "--bootstrap" option (#34015)

This commit is contained in:
Massimiliano Culpo 2022-11-19 16:09:34 +01:00 committed by GitHub
parent 6d0a8f78b2
commit 45b4cedb7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 30 deletions

View file

@ -140,13 +140,6 @@ def setup_parser(subparser):
subparser.add_argument("--start-date", help="earliest date of installation [YYYY-MM-DD]") subparser.add_argument("--start-date", help="earliest date of installation [YYYY-MM-DD]")
subparser.add_argument("--end-date", help="latest date of installation [YYYY-MM-DD]") subparser.add_argument("--end-date", help="latest date of installation [YYYY-MM-DD]")
subparser.add_argument(
"-b",
"--bootstrap",
action="store_true",
help="show software in the internal bootstrap store",
)
arguments.add_common_arguments(subparser, ["constraint"]) arguments.add_common_arguments(subparser, ["constraint"])
@ -251,23 +244,6 @@ def display_env(env, args, decorator, results):
def find(parser, args): def find(parser, args):
if args.bootstrap:
tty.warn(
"`spack find --bootstrap` is deprecated and will be removed in v0.19.",
"Use `spack --bootstrap find` instead.",
)
if args.bootstrap:
bootstrap_store_path = spack.bootstrap.store_path()
with spack.bootstrap.ensure_bootstrap_configuration():
msg = 'Showing internal bootstrap store at "{0}"'
tty.msg(msg.format(bootstrap_store_path))
_find(parser, args)
return
_find(parser, args)
def _find(parser, args):
q_args = query_arguments(args) q_args = query_arguments(args)
results = args.specs(**q_args) results = args.specs(**q_args)

View file

@ -373,8 +373,3 @@ def test_find_loaded(database, working_env):
output = find("--loaded") output = find("--loaded")
expected = find() expected = find()
assert output == expected assert output == expected
def test_bootstrap_deprecated():
output = find("--bootstrap")
assert "`spack find --bootstrap` is deprecated" in output

View file

@ -1047,7 +1047,7 @@ _spack_fetch() {
_spack_find() { _spack_find() {
if $list_options if $list_options
then then
SPACK_COMPREPLY="-h --help --format --json -d --deps -p --paths --groups --no-groups -l --long -L --very-long -t --tag -c --show-concretized -f --show-flags --show-full-compiler -x --explicit -X --implicit -u --unknown -m --missing -v --variants --loaded -M --only-missing --deprecated --only-deprecated -N --namespace --start-date --end-date -b --bootstrap" SPACK_COMPREPLY="-h --help --format --json -d --deps -p --paths --groups --no-groups -l --long -L --very-long -t --tag -c --show-concretized -f --show-flags --show-full-compiler -x --explicit -X --implicit -u --unknown -m --missing -v --variants --loaded -M --only-missing --deprecated --only-deprecated -N --namespace --start-date --end-date"
else else
_installed_packages _installed_packages
fi fi