summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2018-08-19 18:11:52 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2018-08-20 16:36:04 -0700
commit63004e3de1473254c3b2a75f1e06afaabdacd7dd (patch)
tree50f6058995cb3f0f08cd86bbcf9ba8a81826c82b /bin
parent2e8a820afd683f7f68b0ce04853b3c3fefe9ed2a (diff)
downloadspack-63004e3de1473254c3b2a75f1e06afaabdacd7dd.tar.gz
spack-63004e3de1473254c3b2a75f1e06afaabdacd7dd.tar.bz2
spack-63004e3de1473254c3b2a75f1e06afaabdacd7dd.tar.xz
spack-63004e3de1473254c3b2a75f1e06afaabdacd7dd.zip
yaml: use ruamel.yaml instead of pyyaml
- ruamel.yaml allows round-tripping comments from/to files - ruamel.yaml is single-source, python2/python3 compatible
Diffstat (limited to 'bin')
-rwxr-xr-xbin/spack7
1 files changed, 0 insertions, 7 deletions
diff --git a/bin/spack b/bin/spack
index 80e47caa1a..22a7032daa 100755
--- a/bin/spack
+++ b/bin/spack
@@ -49,13 +49,6 @@ if sys.version_info[:2] == (2, 6):
sys.path.insert(0, spack_external_libs)
-# Handle vendoring of YAML specially, as it has two versions.
-if sys.version_info[0] == 2:
- spack_yaml_libs = os.path.join(spack_external_libs, "yaml/lib")
-else:
- spack_yaml_libs = os.path.join(spack_external_libs, "yaml/lib3")
-sys.path.insert(0, spack_yaml_libs)
-
# Once we've set up the system path, run the spack main method
import spack.main # noqa
sys.exit(spack.main.main())