From 0331b08c64abbc3d7c185d9650007be1de238cfc Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 7 Mar 2017 09:32:43 -0800 Subject: Update externals to work with Python 3 - Update YAML version to support Python 3 - Python 3 support for ordereddict backport - Exclude Python3 YAML from version tests. - Vendor six into Spack. - Make Python version-check tests work with Python 3 - Add ability to add version check exceptions with '# nopyqver' line comments. --- bin/spack | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'bin') diff --git a/bin/spack b/bin/spack index f885f577c8..550b999eb9 100755 --- a/bin/spack +++ b/bin/spack @@ -46,6 +46,13 @@ sys.path.insert(0, SPACK_LIB_PATH) SPACK_EXTERNAL_LIBS = os.path.join(SPACK_LIB_PATH, "external") 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) + # Quick and dirty check to clean orphaned .pyc files left over from # previous revisions. These files were present in earlier versions of # Spack, were removed, but shadow system modules that Spack still -- cgit v1.2.3-70-g09d2