hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Insert lib/spack/external into sys.path. This avoids cases where the system

Browse source 
python install and lib/spack/external have the same library installed. This
requires modifying the names of some modules in lib/spack/external in cases
where both the system python and backported features of future python versions
(i.e. after 2.6) are used (previously distinguished by "from external import X"
and "import X").
This commit is contained in:
Peter Scheibel 2015-11-11 18:04:22 -08:00
parent 9474b8cdac
commit 6d7b26d4e0
43 changed files with 46 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/spack
View file

@ -38,6 +38,8 @@ SPACK_PREFIX = os.path.dirname(os.path.dirname(SPACK_FILE))
# Allow spack libs to be imported in our scripts
SPACK_LIB_PATH = os.path.join(SPACK_PREFIX, "lib", "spack")
sys.path.insert(0, SPACK_LIB_PATH)
SPACK_EXTERNAL_LIBS = os.path.join(SPACK_LIB_PATH, "external")
sys.path.insert(0, SPACK_EXTERNAL_LIBS)
# If there is no working directory, use the spack prefix.
try:

0
lib/spack/external/functools.py → lib/spack/external/functools_backport.py vendored
View file

0
lib/spack/external/ordereddict.py → lib/spack/external/ordereddict_backport.py vendored
View file

2
lib/spack/spack/cmd/activate.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import llnl.util.tty as tty
import spack
import spack.cmd

2
lib/spack/spack/cmd/checksum.py
View file

@ -24,7 +24,7 @@
##############################################################################
import os
import re
from external import argparse
import argparse
import hashlib
from pprint import pprint
from subprocess import CalledProcessError

2
lib/spack/spack/cmd/clean.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import llnl.util.tty as tty

2
lib/spack/spack/cmd/compiler.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import llnl.util.tty as tty
from llnl.util.tty.color import colorize

2
lib/spack/spack/cmd/config.py
View file

@ -23,7 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
import sys
from external import argparse
import argparse
import llnl.util.tty as tty

2
lib/spack/spack/cmd/create.py
View file

@ -27,7 +27,7 @@
import hashlib
import re
from external.ordereddict import OrderedDict
from ordereddict_backport import OrderedDict
import llnl.util.tty as tty
from llnl.util.filesystem import mkdirp

2
lib/spack/spack/cmd/deactivate.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import llnl.util.tty as tty
import spack

2
lib/spack/spack/cmd/dependents.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import llnl.util.tty as tty

2
lib/spack/spack/cmd/diy.py
View file

@ -24,7 +24,7 @@
##############################################################################
import sys
import os
from external import argparse
import argparse
import llnl.util.tty as tty

2
lib/spack/spack/cmd/env.py
View file

@ -23,7 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
import os
from external import argparse
import argparse
import llnl.util.tty as tty
import spack.cmd
import spack.build_environment as build_env

2
lib/spack/spack/cmd/extensions.py
View file

@ -23,7 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
import sys
from external import argparse
import argparse
import llnl.util.tty as tty
from llnl.util.tty.colify import colify

2
lib/spack/spack/cmd/fetch.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import spack
import spack.cmd

2
lib/spack/spack/cmd/find.py
View file

@ -25,7 +25,7 @@
import sys
import collections
import itertools
from external import argparse
import argparse
from StringIO import StringIO
import llnl.util.tty as tty

2
lib/spack/spack/cmd/graph.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import spack
import spack.cmd

2
lib/spack/spack/cmd/install.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import llnl.util.tty as tty

2
lib/spack/spack/cmd/list.py
View file

@ -24,7 +24,7 @@
##############################################################################
import sys
import llnl.util.tty as tty
from external import argparse
import argparse
from llnl.util.tty.colify import colify
import spack

2
lib/spack/spack/cmd/load.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import spack.modules
description ="Add package to environment using modules."

2
lib/spack/spack/cmd/location.py
View file

@ -24,7 +24,7 @@
##############################################################################
import os
import sys
from external import argparse
import argparse
import llnl.util.tty as tty
from llnl.util.filesystem import join_path

2
lib/spack/spack/cmd/md5.py
View file

@ -24,7 +24,7 @@
##############################################################################
import os
import hashlib
from external import argparse
import argparse
import llnl.util.tty as tty
from llnl.util.filesystem import *

2
lib/spack/spack/cmd/mirror.py
View file

@ -26,7 +26,7 @@
import sys
from datetime import datetime
from external import argparse
import argparse
import llnl.util.tty as tty
from llnl.util.tty.colify import colify

2
lib/spack/spack/cmd/module.py
View file

@ -25,7 +25,7 @@
import sys
import os
import shutil
from external import argparse
import argparse
import llnl.util.tty as tty
from llnl.util.lang import partition_list

2
lib/spack/spack/cmd/patch.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import spack.cmd
import spack

2
lib/spack/spack/cmd/pkg.py
View file

@ -24,7 +24,7 @@
##############################################################################
import os
from external import argparse
import argparse
import llnl.util.tty as tty
from llnl.util.tty.colify import colify

2
lib/spack/spack/cmd/providers.py
View file

@ -23,7 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
import os
from external import argparse
import argparse
from llnl.util.tty.colify import colify

2
lib/spack/spack/cmd/python.py
View file

@ -25,7 +25,7 @@
import os
import sys
import code
from external import argparse
import argparse
import platform
import spack

2
lib/spack/spack/cmd/reindex.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import spack
description = "Rebuild Spack's package database."

2
lib/spack/spack/cmd/restage.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import llnl.util.tty as tty

2
lib/spack/spack/cmd/spec.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import spack.cmd
import llnl.util.tty as tty

2
lib/spack/spack/cmd/stage.py
View file

@ -23,7 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
import os
from external import argparse
import argparse
import llnl.util.tty as tty
import spack

2
lib/spack/spack/cmd/test-install.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import xml.etree.ElementTree as ET
import itertools
import re

2
lib/spack/spack/cmd/uninstall.py
View file

@ -23,7 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
import sys
from external import argparse
import argparse
import llnl.util.tty as tty
from llnl.util.tty.colify import colify

2
lib/spack/spack/cmd/unload.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import spack.modules
description ="Remove package from environment using module."

2
lib/spack/spack/cmd/unuse.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import spack.modules
description ="Remove package from environment using dotkit."

2
lib/spack/spack/cmd/use.py
View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
import argparse
import spack.modules
description ="Add package to environment using dotkit."

6
lib/spack/spack/config.py
View file

@ -90,12 +90,12 @@
import exceptions
import sys
from external.ordereddict import OrderedDict
from ordereddict_backport import OrderedDict
from llnl.util.lang import memoized
import spack.error
from external import yaml
from external.yaml.error import MarkedYAMLError
import yaml
from yaml.error import MarkedYAMLError
import llnl.util.tty as tty
from llnl.util.filesystem import mkdirp

4
lib/spack/spack/database.py
View file

@ -43,8 +43,8 @@
import time
import socket
from external import yaml
from external.yaml.error import MarkedYAMLError, YAMLError
import yaml
from yaml.error import MarkedYAMLError, YAMLError
import llnl.util.tty as tty
from llnl.util.filesystem import *

2
lib/spack/spack/directory_layout.py
View file

@ -29,7 +29,7 @@
import shutil
import glob
import tempfile
from external import yaml
import yaml
import llnl.util.tty as tty
from llnl.util.filesystem import join_path, mkdirp

4
lib/spack/spack/spec.py
View file

@ -96,8 +96,8 @@
import base64
from StringIO import StringIO
from operator import attrgetter
from external import yaml
from external.yaml.error import MarkedYAMLError
import yaml
from yaml.error import MarkedYAMLError
import llnl.util.tty as tty
from llnl.util.lang import *

2
lib/spack/spack/test/python_version.py
View file

@ -34,7 +34,7 @@
import llnl.util.tty as tty
from external import pyqver2
import pyqver2
import spack
spack_max_version = (2,6)

2
lib/spack/spack/version.py
View file

@ -48,7 +48,7 @@
import re
from bisect import bisect_left
from functools import wraps
from external.functools import total_ordering
from functools_backport import total_ordering
# Valid version characters
VALID_VERSION = r'[A-Za-z0-9_.-]'