zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Warn about removal of deprecated format strings (#33829)" (#34056)

Browse Source 
This reverts commit 7f9af8d4a0.
This commit is contained in:
Massimiliano Culpo 2022-11-22 12:35:36 +01:00 committed by GitHub
parent 7f9af8d4a0
commit bd198312c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/spack/defaults/config.yaml
View File

@ -19,7 +19,7 @@ config:
install_tree: install_tree:
root: $spack/opt/spack root: $spack/opt/spack
projections: 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) # install_tree can include an optional padded length (int or boolean)
# default is False (do not pad) # default is False (do not pad)
# if padded_length is True, Spack will pad as close to the system max path # if padded_length is True, Spack will pad as close to the system max path

5
lib/spack/spack/spec.py
View File

@ -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., ``$6#`` to customize short hash length
TODO: allow, e.g., ``$//`` for full hash. 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) color = kwargs.get("color", False)
# Dictionary of transformations for named tokens # Dictionary of transformations for named tokens

2
lib/spack/spack/test/directory_layout.py
View File

@ -59,7 +59,7 @@ def test_yaml_directory_layout_parameters(tmpdir, default_mock_concretization):
arch_scheme = ( arch_scheme = (
"{architecture.platform}/{architecture.target}/{architecture.os}/{name}/{version}/{hash:7}" "{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} arch_ns_scheme_projections = {"all": arch_scheme, "python": ns_scheme}
layout_arch_ns = DirectoryLayout(str(tmpdir), projections=arch_ns_scheme_projections) layout_arch_ns = DirectoryLayout(str(tmpdir), projections=arch_ns_scheme_projections)

2
share/spack/qa/configuration/windows_config.yaml
View File

@ -3,6 +3,6 @@ config:
install_tree: install_tree:
root: $spack\opt\spack root: $spack\opt\spack
projections: projections:
all: '${architecture}\${compiler.name}-${compiler.version}\${name}-${version}-${hash}' all: '${ARCHITECTURE}\${COMPILERNAME}-${COMPILERVER}\${PACKAGE}-${VERSION}-${HASH}'
build_stage: build_stage:
- ~/.spack/stage - ~/.spack/stage