From f4cb63d6f27f68814bd6131f43c1eee6fa8d099e Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@tgac.ac.uk>
Date: Wed, 10 Aug 2016 15:17:17 +0100
Subject: [PATCH] Pin flake8 version

Do not pin when forward-merging to dev branch.
Also ignore .tox/ and eggs/ as in #2650 .
---
 .ci/flake8_blacklist.txt | 2 ++
 tox.ini                  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.ci/flake8_blacklist.txt b/.ci/flake8_blacklist.txt
index fc0d305bde8..37de99af606 100644
--- a/.ci/flake8_blacklist.txt
+++ b/.ci/flake8_blacklist.txt
@@ -1,4 +1,6 @@
 .venv/
+.tox/
+eggs/
 client/
 database/
 doc/patch.py
diff --git a/tox.ini b/tox.ini
index 0e0676b4b19..9bdfcbcdc81 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,17 +6,17 @@ skipsdist = True
 [testenv:py27-lint]
 commands = bash .ci/flake8_wrapper.sh
 whitelist_externals = bash
-deps = flake8
+deps = flake8==3.0.4
 
 [testenv:py26-lint]
 commands = bash .ci/flake8_wrapper.sh
 whitelist_externals = bash
-deps = flake8
+deps = flake8<3.0.0
 
 [testenv:py34-lint]
 commands = bash .ci/flake8_py3_wrapper.sh
 whitelist_externals = bash
-deps = flake8
+deps = flake8==3.0.4
 
 
 [testenv:py27-unit]