summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-12-29 11:59:45 -0800
committerGitHub <noreply@github.com>2016-12-29 11:59:45 -0800
commitd6390c159f979179be9e0231b3ba1916e579ae55 (patch)
treead0367acc743610b75d7d16233e312fd681a0378 /bin
parent7ea10e768ee1a7deab98ae538d916bbeeb0346b8 (diff)
downloadspack-d6390c159f979179be9e0231b3ba1916e579ae55.tar.gz
spack-d6390c159f979179be9e0231b3ba1916e579ae55.tar.bz2
spack-d6390c159f979179be9e0231b3ba1916e579ae55.tar.xz
spack-d6390c159f979179be9e0231b3ba1916e579ae55.zip
Fix issues related to the switchover to pytest. (#2685)
- Remove stale reference to `import nose` from `bin/spack` script. - Add `py` to externals (missing dependency for `pytest`)
Diffstat (limited to 'bin')
-rwxr-xr-xbin/spack8
1 files changed, 0 insertions, 8 deletions
diff --git a/bin/spack b/bin/spack
index 2ff55a486b..66bebe57e7 100755
--- a/bin/spack
+++ b/bin/spack
@@ -46,14 +46,6 @@ sys.path.insert(0, SPACK_LIB_PATH)
SPACK_EXTERNAL_LIBS = os.path.join(SPACK_LIB_PATH, "external")
sys.path.insert(0, SPACK_EXTERNAL_LIBS)
-import warnings
-# Avoid warnings when nose is installed with the python exe being used to run
-# spack. Note this must be done after Spack's external libs directory is added
-# to sys.path.
-with warnings.catch_warnings():
- warnings.filterwarnings("ignore", ".*nose was already imported")
- import nose
-
# 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