From d7847ff7685a52670a9d01cf39bd44eff1a57684 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Wed, 11 May 2016 01:16:41 -0700
Subject: [PATCH] Use just one flake8 file; mark package.py files to avoid E501
 w/url.

---
 share/spack/qa/flake8-packages => .flake8              |  3 ++-
 share/spack/qa/flake8-framework                        | 10 ----------
 .../repos/builtin/packages/ImageMagick/package.py      |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)
 rename share/spack/qa/flake8-packages => .flake8 (71%)
 delete mode 100644 share/spack/qa/flake8-framework

diff --git a/share/spack/qa/flake8-packages b/.flake8
similarity index 71%
rename from share/spack/qa/flake8-packages
rename to .flake8
index 0e5be249fb..ab1e14b66e 100644
--- a/share/spack/qa/flake8-packages
+++ b/.flake8
@@ -6,6 +6,7 @@
 # E241: multiple spaces after ‘,’
 # F403: disable wildcard import
 # F821: undefined name (needed for build commands)
+# F999: Undefined undefined name (needed for build commands)
 #
-ignore = E221,E241,F403,F821
+ignore = E221,E241,F403,F821,F999
 max-line-length = 79
diff --git a/share/spack/qa/flake8-framework b/share/spack/qa/flake8-framework
deleted file mode 100644
index b1ad00b80f..0000000000
--- a/share/spack/qa/flake8-framework
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- conf -*-
-[flake8]
-# Descriptions of ignored checks:
-#
-# E221: multiple spaces before operator
-# E241: multiple spaces after ‘,’
-# F403: disable wildcard import
-#
-ignore = E221,E241,F403
-max-line-length = 79
diff --git a/var/spack/repos/builtin/packages/ImageMagick/package.py b/var/spack/repos/builtin/packages/ImageMagick/package.py
index 7a3d12e364..3a86d9fb7c 100644
--- a/var/spack/repos/builtin/packages/ImageMagick/package.py
+++ b/var/spack/repos/builtin/packages/ImageMagick/package.py
@@ -24,7 +24,7 @@ class Imagemagick(Package):
     version(
         '6.8.9-10',
         'aa050bf9785e571c956c111377bbf57c',
-        url="http://sourceforge.net/projects/imagemagick/files/old-sources/6.x/6.8/ImageMagick-6.8.9-10.tar.gz/download")  # NOQA: ignore=E501
+        url="http://sourceforge.net/projects/imagemagick/files/old-sources/6.x/6.8/ImageMagick-6.8.9-10.tar.gz/download")
 
     depends_on('jpeg')
     depends_on('libtool')