From d6390c159f979179be9e0231b3ba1916e579ae55 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 29 Dec 2016 11:59:45 -0800 Subject: 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`) --- bin/spack | 8 -------- 1 file changed, 8 deletions(-) (limited to 'bin') 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 -- cgit v1.2.3-60-g2f50