This reverts commit 7f9af8d4a0
.
This commit is contained in:
parent
7f9af8d4a0
commit
bd198312c9
4 changed files with 6 additions and 9 deletions
|
@ -19,7 +19,7 @@ config:
|
|||
install_tree:
|
||||
root: $spack/opt/spack
|
||||
projections:
|
||||
all: "${architecture}/${compiler.name}-${compiler.version}/${name}-${version}-${hash}"
|
||||
all: "${ARCHITECTURE}/${COMPILERNAME}-${COMPILERVER}/${PACKAGE}-${VERSION}-${HASH}"
|
||||
# install_tree can include an optional padded length (int or boolean)
|
||||
# default is False (do not pad)
|
||||
# if padded_length is True, Spack will pad as close to the system max path
|
||||
|
@ -214,4 +214,4 @@ config:
|
|||
|
||||
# Number of seconds a buildcache's index.json is cached locally before probing
|
||||
# for updates, within a single Spack invocation. Defaults to 10 minutes.
|
||||
binary_index_ttl: 600
|
||||
binary_index_ttl: 600
|
|
@ -4418,10 +4418,7 @@ def old_format(self, format_string="$_$@$%@+$+$=", **kwargs):
|
|||
TODO: allow, e.g., ``$6#`` to customize short hash length
|
||||
TODO: allow, e.g., ``$//`` for full hash.
|
||||
"""
|
||||
tty.warn(
|
||||
"Using the old Spec.format method."
|
||||
" This method was deprecated in Spack v0.15 and will be removed in Spack v0.20"
|
||||
)
|
||||
|
||||
color = kwargs.get("color", False)
|
||||
|
||||
# Dictionary of transformations for named tokens
|
||||
|
|
|
@ -59,7 +59,7 @@ def test_yaml_directory_layout_parameters(tmpdir, default_mock_concretization):
|
|||
arch_scheme = (
|
||||
"{architecture.platform}/{architecture.target}/{architecture.os}/{name}/{version}/{hash:7}"
|
||||
)
|
||||
ns_scheme = "${architecture}/${namespace}/${name}-${version}-${hash:7}"
|
||||
ns_scheme = "${ARCHITECTURE}/${NAMESPACE}/${PACKAGE}-${VERSION}-${HASH:7}"
|
||||
arch_ns_scheme_projections = {"all": arch_scheme, "python": ns_scheme}
|
||||
layout_arch_ns = DirectoryLayout(str(tmpdir), projections=arch_ns_scheme_projections)
|
||||
|
||||
|
|
|
@ -3,6 +3,6 @@ config:
|
|||
install_tree:
|
||||
root: $spack\opt\spack
|
||||
projections:
|
||||
all: '${architecture}\${compiler.name}-${compiler.version}\${name}-${version}-${hash}'
|
||||
all: '${ARCHITECTURE}\${COMPILERNAME}-${COMPILERVER}\${PACKAGE}-${VERSION}-${HASH}'
|
||||
build_stage:
|
||||
- ~/.spack/stage
|
||||
- ~/.spack/stage
|
Loading…
Reference in a new issue