summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-05-10 12:44:24 +0200
committeralalazo <massimiliano.culpo@googlemail.com>2016-05-10 12:44:24 +0200
commitc11a665ba15317cb391abdb8eb6c8a517e4e9b54 (patch)
tree68a4921dfc49133d9c0b6d35d8152f9aaf1c54de
parent9eee71edf784cbbe0a3772bdbf634f0df6133240 (diff)
parent1a563c2b31315e741fc050c46d203c11e079ec5f (diff)
downloadspack-c11a665ba15317cb391abdb8eb6c8a517e4e9b54.tar.gz
spack-c11a665ba15317cb391abdb8eb6c8a517e4e9b54.tar.bz2
spack-c11a665ba15317cb391abdb8eb6c8a517e4e9b54.tar.xz
spack-c11a665ba15317cb391abdb8eb6c8a517e4e9b54.zip
Merge branch 'develop' of https://github.com/LLNL/spack into features/custom_modulefile_from_config
-rw-r--r--.style.yapf2
-rw-r--r--flake8.ini4
2 files changed, 3 insertions, 3 deletions
diff --git a/.style.yapf b/.style.yapf
index 4741fb4f3b..a4b3f65252 100644
--- a/.style.yapf
+++ b/.style.yapf
@@ -1,3 +1,3 @@
[style]
based_on_style = pep8
-column_limit = 80
+column_limit = 79
diff --git a/flake8.ini b/flake8.ini
index 757c71705e..f8bff04355 100644
--- a/flake8.ini
+++ b/flake8.ini
@@ -1,3 +1,3 @@
[flake8]
-ignore = W391,F403
-max-line-length = 120 \ No newline at end of file
+ignore = W391,F403,E221
+max-line-length = 79