Skip to content

Commit

Permalink
Complete environment updates: anonymous->independent (#340)
Browse files Browse the repository at this point in the history
  • Loading branch information
tldahlgren committed May 9, 2024
1 parent c4dc7cd commit c1422e1
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
24 changes: 12 additions & 12 deletions outputs/environments.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,30 +128,30 @@ example environments/env-list-2 "spack env list"

example environments/cat-config-1 "cat spack.yaml"

example environments/anonymous-create-1 "cd"
example environments/independent-create-1 "cd"
cd || exit
example environments/anonymous-create-1 "mkdir code"
example environments/anonymous-create-1 "cd code"
example environments/independent-create-1 "mkdir code"
example environments/independent-create-1 "cd code"
cd code || exit
example environments/anonymous-create-1 "spack env create -d ."
example environments/independent-create-1 "spack env create -d ."

example environments/anonymous-create-2 "ls"
example environments/anonymous-create-2 "cat spack.yaml"
example environments/independent-create-2 "ls"
example environments/independent-create-2 "cat spack.yaml"

example environments/env-list-3 "spack env list"

example --tee environments/install-anonymous-1 "spack env activate ."
example --tee environments/install-independent-1 "spack env activate ."
spack env activate .
# mock a hand-edit from before we activated
spack add trilinos
spack add openmpi
example environments/install-anonymous-1 "spack install"
example environments/install-independent-1 "spack install"

example environments/add-anonymous-1 "spack add hdf5@5.5.1"
example environments/add-anonymous-1 "cat spack.yaml"
example environments/add-independent-1 "spack add hdf5@5.5.1"
example environments/add-independent-1 "cat spack.yaml"

example environments/remove-anonymous-1 "spack remove hdf5"
example environments/remove-anonymous-1 "cat spack.yaml"
example environments/remove-independent-1 "spack remove hdf5"
example environments/remove-independent-1 "cat spack.yaml"

example environments/lockfile-1 "jq < spack.lock | head -30"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions tutorial_environments.rst
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ as environment-based software releases and CI/CD.
Let's create an *independent* environment from scratch for a simple
project:

.. literalinclude:: outputs/environments/anonymous-create-1.out
.. literalinclude:: outputs/environments/independent-create-1.out
:language: console


Expand All @@ -645,7 +645,7 @@ it must be referenced by its directory path.
Let's see what really happened with this command by listing the
directory contents and looking at the configuration file:

.. literalinclude:: outputs/environments/anonymous-create-2.out
.. literalinclude:: outputs/environments/independent-create-2.out
:language: console


Expand Down Expand Up @@ -685,7 +685,7 @@ should now contain the following entries:
Now activate the environment and install the packages:

.. literalinclude:: outputs/environments/install-anonymous-1.out
.. literalinclude:: outputs/environments/install-independent-1.out
:language: console


Expand All @@ -704,7 +704,7 @@ outside of the environment using the command line interface as before.

For example, let's add ``hdf5`` and look at our file:

.. literalinclude:: outputs/environments/add-anonymous-1.out
.. literalinclude:: outputs/environments/add-independent-1.out
:language: console


Expand All @@ -719,7 +719,7 @@ it appears in the configuration file's spec list.

Now use ``spack remove`` to remove the spec from the configuration:

.. literalinclude:: outputs/environments/remove-anonymous-1.out
.. literalinclude:: outputs/environments/remove-independent-1.out
:language: console

and we see that the spec *was* removed from the spec list of our
Expand Down
2 changes: 1 addition & 1 deletion tutorial_stacks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ recent than the one provided by the system.
Setup the compiler
^^^^^^^^^^^^^^^^^^

Let's create a new anonymous environment and setup the compiler we want to use to build
Let's create a new independent environment and setup the compiler we want to use to build
our stack:

.. literalinclude:: outputs/stacks/setup-0.out
Expand Down

0 comments on commit c1422e1

Please sign in to comment.