diff options
-rw-r--r-- | lib/spack/spack/cmd/common/arguments.py | 8 | ||||
-rw-r--r-- | lib/spack/spack/cmd/dev_build.py | 7 | ||||
-rw-r--r-- | lib/spack/spack/cmd/fetch.py | 7 | ||||
-rw-r--r-- | lib/spack/spack/cmd/install.py | 5 | ||||
-rw-r--r-- | lib/spack/spack/cmd/mirror.py | 6 | ||||
-rw-r--r-- | lib/spack/spack/cmd/patch.py | 5 | ||||
-rw-r--r-- | lib/spack/spack/cmd/stage.py | 5 | ||||
-rwxr-xr-x | share/spack/spack-completion.bash | 26 | ||||
-rwxr-xr-x | share/spack/spack-completion.fish | 78 |
9 files changed, 80 insertions, 67 deletions
diff --git a/lib/spack/spack/cmd/common/arguments.py b/lib/spack/spack/cmd/common/arguments.py index 12f9e5b0d7..ab9f893980 100644 --- a/lib/spack/spack/cmd/common/arguments.py +++ b/lib/spack/spack/cmd/common/arguments.py @@ -570,6 +570,14 @@ def add_concretizer_args(subparser): default=None, help="reuse installed dependencies only", ) + subgroup.add_argument( + "--deprecated", + action=ConfigSetAction, + dest="config:deprecated", + const=True, + default=None, + help="allow concretizer to select deprecated versions", + ) def add_connection_args(subparser, add_help): diff --git a/lib/spack/spack/cmd/dev_build.py b/lib/spack/spack/cmd/dev_build.py index fbd8a78f09..0a8dc49309 100644 --- a/lib/spack/spack/cmd/dev_build.py +++ b/lib/spack/spack/cmd/dev_build.py @@ -19,7 +19,7 @@ level = "long" def setup_parser(subparser): - arguments.add_common_arguments(subparser, ["jobs"]) + arguments.add_common_arguments(subparser, ["jobs", "no_checksum", "spec"]) subparser.add_argument( "-d", "--source-path", @@ -34,7 +34,6 @@ def setup_parser(subparser): dest="ignore_deps", help="do not try to install dependencies of requested packages", ) - arguments.add_common_arguments(subparser, ["no_checksum", "deprecated"]) subparser.add_argument( "--keep-prefix", action="store_true", @@ -63,7 +62,6 @@ def setup_parser(subparser): choices=["root", "all"], help="run tests on only root packages or all packages", ) - arguments.add_common_arguments(subparser, ["spec"]) stop_group = subparser.add_mutually_exclusive_group() stop_group.add_argument( @@ -125,9 +123,6 @@ def dev_build(self, args): if args.no_checksum: spack.config.set("config:checksum", False, scope="command_line") - if args.deprecated: - spack.config.set("config:deprecated", True, scope="command_line") - tests = False if args.test == "all": tests = True diff --git a/lib/spack/spack/cmd/fetch.py b/lib/spack/spack/cmd/fetch.py index 383c722ad6..0d794eb547 100644 --- a/lib/spack/spack/cmd/fetch.py +++ b/lib/spack/spack/cmd/fetch.py @@ -18,7 +18,7 @@ level = "long" def setup_parser(subparser): - arguments.add_common_arguments(subparser, ["no_checksum", "deprecated"]) + arguments.add_common_arguments(subparser, ["no_checksum", "specs"]) subparser.add_argument( "-m", "--missing", @@ -28,7 +28,7 @@ def setup_parser(subparser): subparser.add_argument( "-D", "--dependencies", action="store_true", help="also fetch all dependencies" ) - arguments.add_common_arguments(subparser, ["specs"]) + arguments.add_concretizer_args(subparser) subparser.epilog = ( "With an active environment, the specs " "parameter can be omitted. In this case all (uninstalled" @@ -40,9 +40,6 @@ def fetch(parser, args): if args.no_checksum: spack.config.set("config:checksum", False, scope="command_line") - if args.deprecated: - spack.config.set("config:deprecated", True, scope="command_line") - if args.specs: specs = spack.cmd.parse_specs(args.specs, concretize=True) else: diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index 9c66c661a0..aa958a682c 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -176,7 +176,7 @@ def setup_parser(subparser): dest="install_source", help="install source files in prefix", ) - arguments.add_common_arguments(subparser, ["no_checksum", "deprecated"]) + arguments.add_common_arguments(subparser, ["no_checksum"]) subparser.add_argument( "-v", "--verbose", @@ -326,9 +326,6 @@ def install(parser, args): if args.no_checksum: spack.config.set("config:checksum", False, scope="command_line") - if args.deprecated: - spack.config.set("config:deprecated", True, scope="command_line") - if args.log_file and not args.log_format: msg = "the '--log-format' must be specified when using '--log-file'" tty.die(msg) diff --git a/lib/spack/spack/cmd/mirror.py b/lib/spack/spack/cmd/mirror.py index fe9cafd545..0faf3123c7 100644 --- a/lib/spack/spack/cmd/mirror.py +++ b/lib/spack/spack/cmd/mirror.py @@ -28,7 +28,7 @@ level = "long" def setup_parser(subparser): - arguments.add_common_arguments(subparser, ["no_checksum", "deprecated"]) + arguments.add_common_arguments(subparser, ["no_checksum"]) sp = subparser.add_subparsers(metavar="SUBCOMMAND", dest="mirror_command") @@ -72,6 +72,7 @@ def setup_parser(subparser): " retrieve all versions of each package", ) arguments.add_common_arguments(create_parser, ["specs"]) + arguments.add_concretizer_args(create_parser) # Destroy destroy_parser = sp.add_parser("destroy", help=mirror_destroy.__doc__) @@ -549,7 +550,4 @@ def mirror(parser, args): if args.no_checksum: spack.config.set("config:checksum", False, scope="command_line") - if args.deprecated: - spack.config.set("config:deprecated", True, scope="command_line") - action[args.mirror_command](args) diff --git a/lib/spack/spack/cmd/patch.py b/lib/spack/spack/cmd/patch.py index e9aac661a2..b5805afd80 100644 --- a/lib/spack/spack/cmd/patch.py +++ b/lib/spack/spack/cmd/patch.py @@ -19,7 +19,7 @@ level = "long" def setup_parser(subparser): - arguments.add_common_arguments(subparser, ["no_checksum", "deprecated", "specs"]) + arguments.add_common_arguments(subparser, ["no_checksum", "specs"]) arguments.add_concretizer_args(subparser) @@ -33,9 +33,6 @@ def patch(parser, args): if args.no_checksum: spack.config.set("config:checksum", False, scope="command_line") - if args.deprecated: - spack.config.set("config:deprecated", True, scope="command_line") - specs = spack.cmd.parse_specs(args.specs, concretize=False) for spec in specs: _patch(spack.cmd.matching_spec_from_env(spec).package) diff --git a/lib/spack/spack/cmd/stage.py b/lib/spack/spack/cmd/stage.py index 8e74bcafca..10a94e3410 100644 --- a/lib/spack/spack/cmd/stage.py +++ b/lib/spack/spack/cmd/stage.py @@ -22,7 +22,7 @@ level = "long" def setup_parser(subparser): - arguments.add_common_arguments(subparser, ["no_checksum", "deprecated", "specs"]) + arguments.add_common_arguments(subparser, ["no_checksum", "specs"]) subparser.add_argument( "-p", "--path", dest="path", help="path to stage package, does not add to spack tree" ) @@ -33,9 +33,6 @@ def stage(parser, args): if args.no_checksum: spack.config.set("config:checksum", False, scope="command_line") - if args.deprecated: - spack.config.set("config:deprecated", True, scope="command_line") - if not args.specs: env = ev.active_environment() if not env: diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash index b268afa76c..bdc2907d42 100755 --- a/share/spack/spack-completion.bash +++ b/share/spack/spack-completion.bash @@ -553,7 +553,7 @@ _spack_bootstrap_mirror() { _spack_build_env() { if $list_options then - SPACK_COMPREPLY="-h --help --clean --dirty -U --fresh --reuse --reuse-deps --dump --pickle" + SPACK_COMPREPLY="-h --help --clean --dirty -U --fresh --reuse --reuse-deps --deprecated --dump --pickle" else _all_packages fi @@ -812,11 +812,11 @@ _spack_compilers() { } _spack_concretize() { - SPACK_COMPREPLY="-h --help -f --force --test -q --quiet -U --fresh --reuse --reuse-deps -j --jobs" + SPACK_COMPREPLY="-h --help -f --force --test -q --quiet -U --fresh --reuse --reuse-deps --deprecated -j --jobs" } _spack_concretise() { - SPACK_COMPREPLY="-h --help -f --force --test -q --quiet -U --fresh --reuse --reuse-deps -j --jobs" + SPACK_COMPREPLY="-h --help -f --force --test -q --quiet -U --fresh --reuse --reuse-deps --deprecated -j --jobs" } _spack_config() { @@ -990,7 +990,7 @@ _spack_deprecate() { _spack_dev_build() { if $list_options then - SPACK_COMPREPLY="-h --help -j --jobs -d --source-path -i --ignore-dependencies -n --no-checksum --deprecated --keep-prefix --skip-patch -q --quiet --drop-in --test -b --before -u --until --clean --dirty -U --fresh --reuse --reuse-deps" + SPACK_COMPREPLY="-h --help -j --jobs -n --no-checksum -d --source-path -i --ignore-dependencies --keep-prefix --skip-patch -q --quiet --drop-in --test -b --before -u --until --clean --dirty -U --fresh --reuse --reuse-deps --deprecated" else _all_packages fi @@ -1170,7 +1170,7 @@ _spack_external_read_cray_manifest() { _spack_fetch() { if $list_options then - SPACK_COMPREPLY="-h --help -n --no-checksum --deprecated -m --missing -D --dependencies" + SPACK_COMPREPLY="-h --help -n --no-checksum -m --missing -D --dependencies -U --fresh --reuse --reuse-deps --deprecated" else _all_packages fi @@ -1299,7 +1299,7 @@ _spack_info() { _spack_install() { if $list_options then - SPACK_COMPREPLY="-h --help --only -u --until -j --jobs --overwrite --fail-fast --keep-prefix --keep-stage --dont-restage --use-cache --no-cache --cache-only --use-buildcache --include-build-deps --no-check-signature --show-log-on-error --source -n --no-checksum --deprecated -v --verbose --fake --only-concrete --add --no-add -f --file --clean --dirty --test --log-format --log-file --help-cdash --cdash-upload-url --cdash-build --cdash-site --cdash-track --cdash-buildstamp -y --yes-to-all -U --fresh --reuse --reuse-deps" + SPACK_COMPREPLY="-h --help --only -u --until -j --jobs --overwrite --fail-fast --keep-prefix --keep-stage --dont-restage --use-cache --no-cache --cache-only --use-buildcache --include-build-deps --no-check-signature --show-log-on-error --source -n --no-checksum -v --verbose --fake --only-concrete --add --no-add -f --file --clean --dirty --test --log-format --log-file --help-cdash --cdash-upload-url --cdash-build --cdash-site --cdash-track --cdash-buildstamp -y --yes-to-all -U --fresh --reuse --reuse-deps --deprecated" else _all_packages fi @@ -1401,7 +1401,7 @@ _spack_mark() { _spack_mirror() { if $list_options then - SPACK_COMPREPLY="-h --help -n --no-checksum --deprecated" + SPACK_COMPREPLY="-h --help -n --no-checksum" else SPACK_COMPREPLY="create destroy add remove rm set-url set list" fi @@ -1410,7 +1410,7 @@ _spack_mirror() { _spack_mirror_create() { if $list_options then - SPACK_COMPREPLY="-h --help -d --directory -a --all -f --file --exclude-file --exclude-specs --skip-unstable-versions -D --dependencies -n --versions-per-spec" + SPACK_COMPREPLY="-h --help -d --directory -a --all -f --file --exclude-file --exclude-specs --skip-unstable-versions -D --dependencies -n --versions-per-spec -U --fresh --reuse --reuse-deps --deprecated" else _all_packages fi @@ -1589,7 +1589,7 @@ _spack_module_tcl_setdefault() { _spack_patch() { if $list_options then - SPACK_COMPREPLY="-h --help -n --no-checksum --deprecated -U --fresh --reuse --reuse-deps" + SPACK_COMPREPLY="-h --help -n --no-checksum -U --fresh --reuse --reuse-deps --deprecated" else _all_packages fi @@ -1817,7 +1817,7 @@ _spack_restage() { _spack_solve() { if $list_options then - SPACK_COMPREPLY="-h --help --show -l --long -L --very-long -N --namespaces -I --install-status --no-install-status -y --yaml -j --json -c --cover -t --types --timers --stats -U --fresh --reuse --reuse-deps" + SPACK_COMPREPLY="-h --help --show -l --long -L --very-long -N --namespaces -I --install-status --no-install-status -y --yaml -j --json -c --cover -t --types --timers --stats -U --fresh --reuse --reuse-deps --deprecated" else _all_packages fi @@ -1826,7 +1826,7 @@ _spack_solve() { _spack_spec() { if $list_options then - SPACK_COMPREPLY="-h --help -l --long -L --very-long -N --namespaces -I --install-status --no-install-status -y --yaml -j --json --format -c --cover -t --types -U --fresh --reuse --reuse-deps" + SPACK_COMPREPLY="-h --help -l --long -L --very-long -N --namespaces -I --install-status --no-install-status -y --yaml -j --json --format -c --cover -t --types -U --fresh --reuse --reuse-deps --deprecated" else _all_packages fi @@ -1835,7 +1835,7 @@ _spack_spec() { _spack_stage() { if $list_options then - SPACK_COMPREPLY="-h --help -n --no-checksum --deprecated -p --path -U --fresh --reuse --reuse-deps" + SPACK_COMPREPLY="-h --help -n --no-checksum -p --path -U --fresh --reuse --reuse-deps --deprecated" else _all_packages fi @@ -1925,7 +1925,7 @@ _spack_test_remove() { _spack_test_env() { if $list_options then - SPACK_COMPREPLY="-h --help --clean --dirty -U --fresh --reuse --reuse-deps --dump --pickle" + SPACK_COMPREPLY="-h --help --clean --dirty -U --fresh --reuse --reuse-deps --deprecated --dump --pickle" else _all_packages fi diff --git a/share/spack/spack-completion.fish b/share/spack/spack-completion.fish index 20f0ec837e..600213454b 100755 --- a/share/spack/spack-completion.fish +++ b/share/spack/spack-completion.fish @@ -660,7 +660,7 @@ complete -c spack -n '__fish_spack_using_command bootstrap mirror' -l dev -f -a complete -c spack -n '__fish_spack_using_command bootstrap mirror' -l dev -d 'download dev dependencies too' # spack build-env -set -g __fish_spack_optspecs_spack_build_env h/help clean dirty U/fresh reuse reuse-deps dump= pickle= +set -g __fish_spack_optspecs_spack_build_env h/help clean dirty U/fresh reuse reuse-deps deprecated dump= pickle= complete -c spack -n '__fish_spack_using_command_pos_remainder 0 build-env' -f -a '(__fish_spack_build_env_spec)' complete -c spack -n '__fish_spack_using_command build-env' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command build-env' -s h -l help -d 'show this help message and exit' @@ -674,6 +674,8 @@ complete -c spack -n '__fish_spack_using_command build-env' -l reuse -f -a concr complete -c spack -n '__fish_spack_using_command build-env' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command build-env' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command build-env' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command build-env' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command build-env' -l deprecated -d 'allow concretizer to select deprecated versions' complete -c spack -n '__fish_spack_using_command build-env' -l dump -r -f -a dump complete -c spack -n '__fish_spack_using_command build-env' -l dump -r -d 'dump a source-able environment to FILE' complete -c spack -n '__fish_spack_using_command build-env' -l pickle -r -f -a pickle @@ -1122,7 +1124,7 @@ complete -c spack -n '__fish_spack_using_command compilers' -l scope -r -f -a '_ complete -c spack -n '__fish_spack_using_command compilers' -l scope -r -d 'configuration scope to read/modify' # spack concretize -set -g __fish_spack_optspecs_spack_concretize h/help f/force test= q/quiet U/fresh reuse reuse-deps j/jobs= +set -g __fish_spack_optspecs_spack_concretize h/help f/force test= q/quiet U/fresh reuse reuse-deps deprecated j/jobs= complete -c spack -n '__fish_spack_using_command concretize' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command concretize' -s h -l help -d 'show this help message and exit' complete -c spack -n '__fish_spack_using_command concretize' -s f -l force -f -a force @@ -1137,11 +1139,13 @@ complete -c spack -n '__fish_spack_using_command concretize' -l reuse -f -a conc complete -c spack -n '__fish_spack_using_command concretize' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command concretize' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command concretize' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command concretize' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command concretize' -l deprecated -d 'allow concretizer to select deprecated versions' complete -c spack -n '__fish_spack_using_command concretize' -s j -l jobs -r -f -a jobs complete -c spack -n '__fish_spack_using_command concretize' -s j -l jobs -r -d 'explicitly set number of parallel jobs' # spack concretise -set -g __fish_spack_optspecs_spack_concretise h/help f/force test= q/quiet U/fresh reuse reuse-deps j/jobs= +set -g __fish_spack_optspecs_spack_concretise h/help f/force test= q/quiet U/fresh reuse reuse-deps deprecated j/jobs= complete -c spack -n '__fish_spack_using_command concretise' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command concretise' -s h -l help -d 'show this help message and exit' complete -c spack -n '__fish_spack_using_command concretise' -s f -l force -f -a force @@ -1156,6 +1160,8 @@ complete -c spack -n '__fish_spack_using_command concretise' -l reuse -f -a conc complete -c spack -n '__fish_spack_using_command concretise' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command concretise' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command concretise' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command concretise' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command concretise' -l deprecated -d 'allow concretizer to select deprecated versions' complete -c spack -n '__fish_spack_using_command concretise' -s j -l jobs -r -f -a jobs complete -c spack -n '__fish_spack_using_command concretise' -s j -l jobs -r -d 'explicitly set number of parallel jobs' @@ -1365,20 +1371,18 @@ complete -c spack -n '__fish_spack_using_command deprecate' -s l -l link-type -r complete -c spack -n '__fish_spack_using_command deprecate' -s l -l link-type -r -d 'type of filesystem link to use for deprecation (default soft)' # spack dev-build -set -g __fish_spack_optspecs_spack_dev_build h/help j/jobs= d/source-path= i/ignore-dependencies n/no-checksum deprecated keep-prefix skip-patch q/quiet drop-in= test= b/before= u/until= clean dirty U/fresh reuse reuse-deps +set -g __fish_spack_optspecs_spack_dev_build h/help j/jobs= n/no-checksum d/source-path= i/ignore-dependencies keep-prefix skip-patch q/quiet drop-in= test= b/before= u/until= clean dirty U/fresh reuse reuse-deps deprecated complete -c spack -n '__fish_spack_using_command_pos_remainder 0 dev-build' -f -k -a '(__fish_spack_specs)' complete -c spack -n '__fish_spack_using_command dev-build' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command dev-build' -s h -l help -d 'show this help message and exit' complete -c spack -n '__fish_spack_using_command dev-build' -s j -l jobs -r -f -a jobs complete -c spack -n '__fish_spack_using_command dev-build' -s j -l jobs -r -d 'explicitly set number of parallel jobs' +complete -c spack -n '__fish_spack_using_command dev-build' -s n -l no-checksum -f -a no_checksum +complete -c spack -n '__fish_spack_using_command dev-build' -s n -l no-checksum -d 'do not use checksums to verify downloaded files (unsafe)' complete -c spack -n '__fish_spack_using_command dev-build' -s d -l source-path -r -f -a source_path complete -c spack -n '__fish_spack_using_command dev-build' -s d -l source-path -r -d 'path to source directory (defaults to the current directory)' complete -c spack -n '__fish_spack_using_command dev-build' -s i -l ignore-dependencies -f -a ignore_deps complete -c spack -n '__fish_spack_using_command dev-build' -s i -l ignore-dependencies -d 'do not try to install dependencies of requested packages' -complete -c spack -n '__fish_spack_using_command dev-build' -s n -l no-checksum -f -a no_checksum -complete -c spack -n '__fish_spack_using_command dev-build' -s n -l no-checksum -d 'do not use checksums to verify downloaded files (unsafe)' -complete -c spack -n '__fish_spack_using_command dev-build' -l deprecated -f -a deprecated -complete -c spack -n '__fish_spack_using_command dev-build' -l deprecated -d 'fetch deprecated versions without warning' complete -c spack -n '__fish_spack_using_command dev-build' -l keep-prefix -f -a keep_prefix complete -c spack -n '__fish_spack_using_command dev-build' -l keep-prefix -d 'do not remove the install prefix if installation fails' complete -c spack -n '__fish_spack_using_command dev-build' -l skip-patch -f -a skip_patch @@ -1403,6 +1407,8 @@ complete -c spack -n '__fish_spack_using_command dev-build' -l reuse -f -a concr complete -c spack -n '__fish_spack_using_command dev-build' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command dev-build' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command dev-build' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command dev-build' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command dev-build' -l deprecated -d 'allow concretizer to select deprecated versions' # spack develop set -g __fish_spack_optspecs_spack_develop h/help p/path= b/build-directory= no-clone clone f/force= @@ -1695,18 +1701,24 @@ complete -c spack -n '__fish_spack_using_command external read-cray-manifest' -l complete -c spack -n '__fish_spack_using_command external read-cray-manifest' -l fail-on-error -d 'if a manifest file cannot be parsed, fail and report the full stack trace' # spack fetch -set -g __fish_spack_optspecs_spack_fetch h/help n/no-checksum deprecated m/missing D/dependencies +set -g __fish_spack_optspecs_spack_fetch h/help n/no-checksum m/missing D/dependencies U/fresh reuse reuse-deps deprecated complete -c spack -n '__fish_spack_using_command_pos_remainder 0 fetch' -f -k -a '(__fish_spack_specs)' complete -c spack -n '__fish_spack_using_command fetch' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command fetch' -s h -l help -d 'show this help message and exit' complete -c spack -n '__fish_spack_using_command fetch' -s n -l no-checksum -f -a no_checksum complete -c spack -n '__fish_spack_using_command fetch' -s n -l no-checksum -d 'do not use checksums to verify downloaded files (unsafe)' -complete -c spack -n '__fish_spack_using_command fetch' -l deprecated -f -a deprecated -complete -c spack -n '__fish_spack_using_command fetch' -l deprecated -d 'fetch deprecated versions without warning' complete -c spack -n '__fish_spack_using_command fetch' -s m -l missing -f -a missing complete -c spack -n '__fish_spack_using_command fetch' -s m -l missing -d 'fetch only missing (not yet installed) dependencies' complete -c spack -n '__fish_spack_using_command fetch' -s D -l dependencies -f -a dependencies complete -c spack -n '__fish_spack_using_command fetch' -s D -l dependencies -d 'also fetch all dependencies' +complete -c spack -n '__fish_spack_using_command fetch' -s U -l fresh -f -a concretizer_reuse +complete -c spack -n '__fish_spack_using_command fetch' -s U -l fresh -d 'do not reuse installed deps; build newest configuration' +complete -c spack -n '__fish_spack_using_command fetch' -l reuse -f -a concretizer_reuse +complete -c spack -n '__fish_spack_using_command fetch' -l reuse -d 'reuse installed packages/buildcaches when possible' +complete -c spack -n '__fish_spack_using_command fetch' -l reuse-deps -f -a concretizer_reuse +complete -c spack -n '__fish_spack_using_command fetch' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command fetch' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command fetch' -l deprecated -d 'allow concretizer to select deprecated versions' # spack find set -g __fish_spack_optspecs_spack_find h/help format= H/hashes json d/deps p/paths groups no-groups l/long L/very-long t/tag= N/namespaces 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 start-date= end-date= @@ -1931,7 +1943,7 @@ complete -c spack -n '__fish_spack_using_command info' -l variants-by-name -f -a complete -c spack -n '__fish_spack_using_command info' -l variants-by-name -d 'list variants in strict name order; don\'t group by condition' # spack install -set -g __fish_spack_optspecs_spack_install h/help only= u/until= j/jobs= overwrite fail-fast keep-prefix keep-stage dont-restage use-cache no-cache cache-only use-buildcache= include-build-deps no-check-signature show-log-on-error source n/no-checksum deprecated v/verbose fake only-concrete add no-add f/file= clean dirty test= log-format= log-file= help-cdash cdash-upload-url= cdash-build= cdash-site= cdash-track= cdash-buildstamp= y/yes-to-all U/fresh reuse reuse-deps +set -g __fish_spack_optspecs_spack_install h/help only= u/until= j/jobs= overwrite fail-fast keep-prefix keep-stage dont-restage use-cache no-cache cache-only use-buildcache= include-build-deps no-check-signature show-log-on-error source n/no-checksum v/verbose fake only-concrete add no-add f/file= clean dirty test= log-format= log-file= help-cdash cdash-upload-url= cdash-build= cdash-site= cdash-track= cdash-buildstamp= y/yes-to-all U/fresh reuse reuse-deps deprecated complete -c spack -n '__fish_spack_using_command_pos_remainder 0 install' -f -k -a '(__fish_spack_specs)' complete -c spack -n '__fish_spack_using_command install' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command install' -s h -l help -d 'show this help message and exit' @@ -1969,8 +1981,6 @@ complete -c spack -n '__fish_spack_using_command install' -l source -f -a instal complete -c spack -n '__fish_spack_using_command install' -l source -d 'install source files in prefix' complete -c spack -n '__fish_spack_using_command install' -s n -l no-checksum -f -a no_checksum complete -c spack -n '__fish_spack_using_command install' -s n -l no-checksum -d 'do not use checksums to verify downloaded files (unsafe)' -complete -c spack -n '__fish_spack_using_command install' -l deprecated -f -a deprecated -complete -c spack -n '__fish_spack_using_command install' -l deprecated -d 'fetch deprecated versions without warning' complete -c spack -n '__fish_spack_using_command install' -s v -l verbose -f -a install_verbose complete -c spack -n '__fish_spack_using_command install' -s v -l verbose -d 'display verbose build output while installing' complete -c spack -n '__fish_spack_using_command install' -l fake -f -a fake @@ -2008,6 +2018,8 @@ complete -c spack -n '__fish_spack_using_command install' -l reuse -f -a concret complete -c spack -n '__fish_spack_using_command install' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command install' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command install' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command install' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command install' -l deprecated -d 'allow concretizer to select deprecated versions' # spack license set -g __fish_spack_optspecs_spack_license h/help root= @@ -2165,7 +2177,7 @@ complete -c spack -n '__fish_spack_using_command mark' -s i -l implicit -f -a im complete -c spack -n '__fish_spack_using_command mark' -s i -l implicit -d 'mark packages as implicitly installed' # spack mirror -set -g __fish_spack_optspecs_spack_mirror h/help n/no-checksum deprecated +set -g __fish_spack_optspecs_spack_mirror h/help n/no-checksum complete -c spack -n '__fish_spack_using_command_pos 0 mirror' -f -a create -d 'create a directory to be used as a spack mirror, and fill it with package archives' complete -c spack -n '__fish_spack_using_command_pos 0 mirror' -f -a destroy -d 'given a url, recursively delete everything under it' complete -c spack -n '__fish_spack_using_command_pos 0 mirror' -f -a add -d 'add a mirror to Spack' @@ -2178,11 +2190,9 @@ complete -c spack -n '__fish_spack_using_command mirror' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command mirror' -s h -l help -d 'show this help message and exit' complete -c spack -n '__fish_spack_using_command mirror' -s n -l no-checksum -f -a no_checksum complete -c spack -n '__fish_spack_using_command mirror' -s n -l no-checksum -d 'do not use checksums to verify downloaded files (unsafe)' -complete -c spack -n '__fish_spack_using_command mirror' -l deprecated -f -a deprecated -complete -c spack -n '__fish_spack_using_command mirror' -l deprecated -d 'fetch deprecated versions without warning' # spack mirror create -set -g __fish_spack_optspecs_spack_mirror_create h/help d/directory= a/all f/file= exclude-file= exclude-specs= skip-unstable-versions D/dependencies n/versions-per-spec= +set -g __fish_spack_optspecs_spack_mirror_create h/help d/directory= a/all f/file= exclude-file= exclude-specs= skip-unstable-versions D/dependencies n/versions-per-spec= U/fresh reuse reuse-deps deprecated complete -c spack -n '__fish_spack_using_command_pos_remainder 0 mirror create' -f -k -a '(__fish_spack_specs)' complete -c spack -n '__fish_spack_using_command mirror create' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command mirror create' -s h -l help -d 'show this help message and exit' @@ -2202,6 +2212,14 @@ complete -c spack -n '__fish_spack_using_command mirror create' -s D -l dependen complete -c spack -n '__fish_spack_using_command mirror create' -s D -l dependencies -d 'also fetch all dependencies' complete -c spack -n '__fish_spack_using_command mirror create' -s n -l versions-per-spec -r -f -a versions_per_spec complete -c spack -n '__fish_spack_using_command mirror create' -s n -l versions-per-spec -r -d 'the number of versions to fetch for each spec, choose \'all\' to retrieve all versions of each package' +complete -c spack -n '__fish_spack_using_command mirror create' -s U -l fresh -f -a concretizer_reuse +complete -c spack -n '__fish_spack_using_command mirror create' -s U -l fresh -d 'do not reuse installed deps; build newest configuration' +complete -c spack -n '__fish_spack_using_command mirror create' -l reuse -f -a concretizer_reuse +complete -c spack -n '__fish_spack_using_command mirror create' -l reuse -d 'reuse installed packages/buildcaches when possible' +complete -c spack -n '__fish_spack_using_command mirror create' -l reuse-deps -f -a concretizer_reuse +complete -c spack -n '__fish_spack_using_command mirror create' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command mirror create' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command mirror create' -l deprecated -d 'allow concretizer to select deprecated versions' # spack mirror destroy set -g __fish_spack_optspecs_spack_mirror_destroy h/help m/mirror-name= mirror-url= @@ -2455,20 +2473,20 @@ complete -c spack -n '__fish_spack_using_command module tcl setdefault' -s h -l complete -c spack -n '__fish_spack_using_command module tcl setdefault' -s h -l help -d 'show this help message and exit' # spack patch -set -g __fish_spack_optspecs_spack_patch h/help n/no-checksum deprecated U/fresh reuse reuse-deps +set -g __fish_spack_optspecs_spack_patch h/help n/no-checksum U/fresh reuse reuse-deps deprecated complete -c spack -n '__fish_spack_using_command_pos_remainder 0 patch' -f -k -a '(__fish_spack_specs)' complete -c spack -n '__fish_spack_using_command patch' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command patch' -s h -l help -d 'show this help message and exit' complete -c spack -n '__fish_spack_using_command patch' -s n -l no-checksum -f -a no_checksum complete -c spack -n '__fish_spack_using_command patch' -s n -l no-checksum -d 'do not use checksums to verify downloaded files (unsafe)' -complete -c spack -n '__fish_spack_using_command patch' -l deprecated -f -a deprecated -complete -c spack -n '__fish_spack_using_command patch' -l deprecated -d 'fetch deprecated versions without warning' complete -c spack -n '__fish_spack_using_command patch' -s U -l fresh -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command patch' -s U -l fresh -d 'do not reuse installed deps; build newest configuration' complete -c spack -n '__fish_spack_using_command patch' -l reuse -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command patch' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command patch' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command patch' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command patch' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command patch' -l deprecated -d 'allow concretizer to select deprecated versions' # spack pkg set -g __fish_spack_optspecs_spack_pkg h/help @@ -2681,7 +2699,7 @@ complete -c spack -n '__fish_spack_using_command restage' -s h -l help -f -a hel complete -c spack -n '__fish_spack_using_command restage' -s h -l help -d 'show this help message and exit' # spack solve -set -g __fish_spack_optspecs_spack_solve h/help show= l/long L/very-long N/namespaces I/install-status no-install-status y/yaml j/json c/cover= t/types timers stats U/fresh reuse reuse-deps +set -g __fish_spack_optspecs_spack_solve h/help show= l/long L/very-long N/namespaces I/install-status no-install-status y/yaml j/json c/cover= t/types timers stats U/fresh reuse reuse-deps deprecated complete -c spack -n '__fish_spack_using_command_pos_remainder 0 solve' -f -k -a '(__fish_spack_specs_or_id)' complete -c spack -n '__fish_spack_using_command solve' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command solve' -s h -l help -d 'show this help message and exit' @@ -2715,9 +2733,11 @@ complete -c spack -n '__fish_spack_using_command solve' -l reuse -f -a concretiz complete -c spack -n '__fish_spack_using_command solve' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command solve' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command solve' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command solve' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command solve' -l deprecated -d 'allow concretizer to select deprecated versions' # spack spec -set -g __fish_spack_optspecs_spack_spec h/help l/long L/very-long N/namespaces I/install-status no-install-status y/yaml j/json format= c/cover= t/types U/fresh reuse reuse-deps +set -g __fish_spack_optspecs_spack_spec h/help l/long L/very-long N/namespaces I/install-status no-install-status y/yaml j/json format= c/cover= t/types U/fresh reuse reuse-deps deprecated complete -c spack -n '__fish_spack_using_command_pos_remainder 0 spec' -f -k -a '(__fish_spack_specs_or_id)' complete -c spack -n '__fish_spack_using_command spec' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command spec' -s h -l help -d 'show this help message and exit' @@ -2747,16 +2767,16 @@ complete -c spack -n '__fish_spack_using_command spec' -l reuse -f -a concretize complete -c spack -n '__fish_spack_using_command spec' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command spec' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command spec' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command spec' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command spec' -l deprecated -d 'allow concretizer to select deprecated versions' # spack stage -set -g __fish_spack_optspecs_spack_stage h/help n/no-checksum deprecated p/path= U/fresh reuse reuse-deps +set -g __fish_spack_optspecs_spack_stage h/help n/no-checksum p/path= U/fresh reuse reuse-deps deprecated complete -c spack -n '__fish_spack_using_command_pos_remainder 0 stage' -f -k -a '(__fish_spack_specs_or_id)' complete -c spack -n '__fish_spack_using_command stage' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command stage' -s h -l help -d 'show this help message and exit' complete -c spack -n '__fish_spack_using_command stage' -s n -l no-checksum -f -a no_checksum complete -c spack -n '__fish_spack_using_command stage' -s n -l no-checksum -d 'do not use checksums to verify downloaded files (unsafe)' -complete -c spack -n '__fish_spack_using_command stage' -l deprecated -f -a deprecated -complete -c spack -n '__fish_spack_using_command stage' -l deprecated -d 'fetch deprecated versions without warning' complete -c spack -n '__fish_spack_using_command stage' -s p -l path -r -f -a path complete -c spack -n '__fish_spack_using_command stage' -s p -l path -r -d 'path to stage package, does not add to spack tree' complete -c spack -n '__fish_spack_using_command stage' -s U -l fresh -f -a concretizer_reuse @@ -2765,6 +2785,8 @@ complete -c spack -n '__fish_spack_using_command stage' -l reuse -f -a concretiz complete -c spack -n '__fish_spack_using_command stage' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command stage' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command stage' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command stage' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command stage' -l deprecated -d 'allow concretizer to select deprecated versions' # spack style set -g __fish_spack_optspecs_spack_style h/help b/base= a/all r/root-relative U/no-untracked f/fix root= t/tool= s/skip= @@ -2881,7 +2903,7 @@ complete -c spack -n '__fish_spack_using_command test remove' -s y -l yes-to-all complete -c spack -n '__fish_spack_using_command test remove' -s y -l yes-to-all -d 'assume "yes" is the answer to every confirmation request' # spack test-env -set -g __fish_spack_optspecs_spack_test_env h/help clean dirty U/fresh reuse reuse-deps dump= pickle= +set -g __fish_spack_optspecs_spack_test_env h/help clean dirty U/fresh reuse reuse-deps deprecated dump= pickle= complete -c spack -n '__fish_spack_using_command_pos_remainder 0 test-env' -f -a '(__fish_spack_build_env_spec)' complete -c spack -n '__fish_spack_using_command test-env' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command test-env' -s h -l help -d 'show this help message and exit' @@ -2895,6 +2917,8 @@ complete -c spack -n '__fish_spack_using_command test-env' -l reuse -f -a concre complete -c spack -n '__fish_spack_using_command test-env' -l reuse -d 'reuse installed packages/buildcaches when possible' complete -c spack -n '__fish_spack_using_command test-env' -l reuse-deps -f -a concretizer_reuse complete -c spack -n '__fish_spack_using_command test-env' -l reuse-deps -d 'reuse installed dependencies only' +complete -c spack -n '__fish_spack_using_command test-env' -l deprecated -f -a config_deprecated +complete -c spack -n '__fish_spack_using_command test-env' -l deprecated -d 'allow concretizer to select deprecated versions' complete -c spack -n '__fish_spack_using_command test-env' -l dump -r -f -a dump complete -c spack -n '__fish_spack_using_command test-env' -l dump -r -d 'dump a source-able environment to FILE' complete -c spack -n '__fish_spack_using_command test-env' -l pickle -r -f -a pickle |