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

Conflicts:
	lib/spack/spack/build_environment.py
	lib/spack/spack/package.py
	var/spack/repos/builtin/packages/astyle/package.py
	var/spack/repos/builtin/packages/lzo/package.py
	var/spack/repos/builtin/packages/openjpeg/package.py
	var/spack/repos/builtin/packages/swiftsim/package.py

1 files changed, 7 insertions, 4 deletions

diff --git a/.flake8 b/.flake8
index b178a2da57..023f392952 100644
--- a/.flake8
+++ b/.flake8
@@ -5,8 +5,10 @@
 # rationale is.
 #
 # Let people line things up nicely:
+# - E129: visually indented line with same indent as next logical line
 # - E221: multiple spaces before operator
-# - E241: multiple spaces after ‘,’
+# - E241: multiple spaces after ','
+# - E272: multiple spaces before keyword
 #
 # Let people use terse Python features:
 # - E731 : lambda expressions
@@ -15,9 +17,10 @@
 # - F403: disable wildcard import
 #
 # These are required to get the package.py files to test clean.
-# - F821: undefined name (needed for cmake, configure, etc.)
-# - F999: name name be undefined or undefined from star imports.
+# - F405: `name` may be undefined, or undefined from star imports: `module`
+# - F821: undefined name `name` (needed for cmake, configure, etc.)
+# - F999: syntax error in doctest
 #
 [flake8]
-ignore = E129,E221,E241,E272,E731,F403,F821,F999,F405
+ignore = E129,E221,E241,E272,E731,F403,F405,F821,F999
 max-line-length = 79