From 79e821a43e4764a3d5bde506889355dbf44b4669 Mon Sep 17 00:00:00 2001 From: Gregory Becker Date: Tue, 21 Feb 2023 15:53:34 -0800 Subject: [PATCH] docs: consistently use 'managed environment' over 'named ...' --- lib/spack/docs/environments.rst | 6 +++--- lib/spack/spack/cmd/env.py | 2 +- lib/spack/spack/cmd/location.py | 2 +- lib/spack/spack/environment/environment.py | 6 +++--- lib/spack/spack/main.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/spack/docs/environments.rst b/lib/spack/docs/environments.rst index 2198e8fce71..e2805e4f016 100644 --- a/lib/spack/docs/environments.rst +++ b/lib/spack/docs/environments.rst @@ -58,9 +58,9 @@ Using Environments Here we follow a typical use case of creating, concretizing, installing and loading an environment. -^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Creating a named Environment -^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Creating a managed Environment +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ An environment is created by: diff --git a/lib/spack/spack/cmd/env.py b/lib/spack/spack/cmd/env.py index fd8bf2de567..789b17cd9ea 100644 --- a/lib/spack/spack/cmd/env.py +++ b/lib/spack/spack/cmd/env.py @@ -166,7 +166,7 @@ def env_activate(args): short_name = os.path.basename(env_path) ev.Environment(env).write(regenerate=False) - # Named environment + # Managed environment elif ev.exists(env_name_or_dir) and not args.dir: env_path = ev.root(env_name_or_dir) short_name = env_name_or_dir diff --git a/lib/spack/spack/cmd/location.py b/lib/spack/spack/cmd/location.py index 7cce744ca7a..aba8264a287 100644 --- a/lib/spack/spack/cmd/location.py +++ b/lib/spack/spack/cmd/location.py @@ -95,7 +95,7 @@ def location(parser, args): spack.cmd.require_active_env("location -e") path = ev.active_environment().path else: - # Get named environment path + # Get path of requested environment if not ev.exists(args.location_env): tty.die("no such environment: '%s'" % args.location_env) path = ev.root(args.location_env) diff --git a/lib/spack/spack/environment/environment.py b/lib/spack/spack/environment/environment.py index 4140fcabb1d..97b7ec69952 100644 --- a/lib/spack/spack/environment/environment.py +++ b/lib/spack/spack/environment/environment.py @@ -271,7 +271,7 @@ def read(name): def create(name, init_file=None, with_view=None, keep_relative=False): - """Create a named environment in Spack.""" + """Create a managed environment in Spack.""" if not os.path.isdir(env_root_path()): fs.mkdirp(env_root_path()) validate_env_name(name) @@ -303,7 +303,7 @@ def all_environment_names(): def all_environments(): - """Generator for all named Environments.""" + """Generator for all managed Environments.""" for name in all_environment_names(): yield read(name) @@ -878,7 +878,7 @@ def name(self): """Human-readable representation of the environment. This is the path for directory environments, and just the name - for named environments. + for managed environments. """ if self.internal: return os.path.basename(self.path) diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index 06183ac112a..ae6bed7fd02 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -459,7 +459,7 @@ def make_argument_parser(**kwargs): dest="env_dir", metavar="DIR", action="store", - help="run with an environment directory (ignore named environments)", + help="run with an environment directory (ignore managed environments)", ) env_group.add_argument( "-E",