Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase

Conflicts:
	lib/spack/spack/cmd/setup.py
	lib/spack/spack/package.py
	var/spack/repos/builtin/packages/gmp/package.py

3 files changed, 9 insertions, 7 deletions

diff --git a/share/spack/qa/changed_files b/share/spack/qa/changed_files
index 9c60b3b20b..c1fa55c053 100755
--- a/share/spack/qa/changed_files
+++ b/share/spack/qa/changed_files
@@ -18,11 +18,11 @@ SPACK_ROOT="$(dirname "$0")/../../.."
 cd "$SPACK_ROOT"
 
 # Add changed files that have been committed since branching off of develop
-changed=($(git diff --name-only --find-renames develop... -- "$@"))
+changed=($(git diff --name-only --diff-filter=ACMR develop... -- "$@"))
 # Add changed files that have been staged but not yet committed
-changed+=($(git diff --name-only --find-renames --cached -- "$@"))
+changed+=($(git diff --name-only --diff-filter=ACMR --cached -- "$@"))
 # Add changed files that are unstaged
-changed+=($(git diff --name-only --find-renames -- "$@"))
+changed+=($(git diff --name-only --diff-filter=ACMR -- "$@"))
 # Add new files that are untracked
 changed+=($(git ls-files --exclude-standard --other -- "$@"))
 
diff --git a/share/spack/qa/check_dependencies b/share/spack/qa/check_dependencies
index 08fad9cdc9..cf3d204f48 100755
--- a/share/spack/qa/check_dependencies
+++ b/share/spack/qa/check_dependencies
@@ -27,6 +27,9 @@ for dep in "$@"; do
                 spack_package=py-flake8
                 pip_package=flake8
                 ;;
+            dot)
+                spack_package=graphviz
+                ;;
             git)
                 spack_package=git
                 ;;
diff --git a/share/spack/qa/run-doc-tests b/share/spack/qa/run-doc-tests
index 96b76a216e..dbf46c71aa 100755
--- a/share/spack/qa/run-doc-tests
+++ b/share/spack/qa/run-doc-tests
@@ -9,7 +9,7 @@
 #     run-doc-tests
 #
 # Notes:
-#     Requires sphinx, git, mercurial, and subversion.
+#     Requires sphinx, graphviz, git, mercurial, and subversion.
 #
 
 QA_DIR="$(dirname "$0")"
@@ -20,6 +20,7 @@ DOC_DIR="$SPACK_ROOT/lib/spack/docs"
 deps=(
     sphinx-apidoc
     sphinx-build
+    dot
     git
     hg
     svn
@@ -35,9 +36,7 @@ export PATH="$SPACK_ROOT/bin:$PATH"
 # Allows script to be run from anywhere
 cd "$DOC_DIR"
 
-# Cleanup temporary files upon exit or when script is killed
-trap 'make clean --silent' EXIT SIGINT SIGTERM
-
 # Treat warnings as fatal errors
+make clean --silent
 make SPHINXOPTS=-W