From c2999ed5adcf08e22a2861982e7bd48f753c720c Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 1 Feb 2017 09:19:32 +0000
Subject: [PATCH] Use pycodestyle instead of PEP8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PEP8 was renamed to pycodestyle; this issue explains why:
https://github.com/PyCQA/pycodestyle/issues/466

This commit changes our tests to use pycodestyle instead of pep8.

It also means:
- making a couple of whitespace changes to appease the linter
- disabling warnings for bare `Except`s (ie `Except` instead of `Except
  ValueError`) – this seems like a sensible thing to catch but I’m not
  going to make meaningful code changes in this commit
---
 README.md                 | 2 +-
 app/models.py             | 2 ++
 requirements_for_test.txt | 2 +-
 scripts/run_tests.sh      | 2 +-
 setup.cfg                 | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index bac936e27..97f0a26a7 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ Then simply run
 make test
 ```
 
-That will run pep8 for code analysis and our unit test suite. If you wish to run our functional tests, instructions can be found in the
+That will run pycodestyle for code analysis and our unit test suite. If you wish to run our functional tests, instructions can be found in the
 [notifications-functional-tests](https://github.com/alphagov/notifications-functional-tests) repository.
 
 
diff --git a/app/models.py b/app/models.py
index 2db1d2906..7ea2dc06b 100644
--- a/app/models.py
+++ b/app/models.py
@@ -153,6 +153,7 @@ class Service(db.Model, Versioned):
         default=BRANDING_GOVUK
     )
 
+
 MOBILE_TYPE = 'mobile'
 EMAIL_TYPE = 'email'
 
@@ -340,6 +341,7 @@ class TemplateHistory(db.Model):
                              nullable=False,
                              default=NORMAL)
 
+
 MMG_PROVIDER = "mmg"
 FIRETEXT_PROVIDER = "firetext"
 SES_PROVIDER = 'ses'
diff --git a/requirements_for_test.txt b/requirements_for_test.txt
index 869499383..62e3e4049 100644
--- a/requirements_for_test.txt
+++ b/requirements_for_test.txt
@@ -1,5 +1,5 @@
 -r requirements.txt
-pep8==1.7.0
+pycodestyle==2.3.1
 pytest==3.0.1
 pytest-mock==1.2
 pytest-cov==2.3.1
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index e6c1bb886..9da50144c 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -27,7 +27,7 @@ function display_result {
 if [[ -z "$VIRTUAL_ENV" ]] && [[ -d venv ]]; then
   source ./venv/bin/activate
 fi
-pep8 .
+pycodestyle .
 display_result $? 1 "Code style check"
 
 py.test --cov=app --cov-report=term-missing tests/ --junitxml=test_results.xml
diff --git a/setup.cfg b/setup.cfg
index 99621085e..6d1c29451 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,4 @@
-[pep8]
+[pycodestyle]
 max-line-length = 120
-ignore = E402
+ignore = E402, E722
 exclude = ./migrations,./venv,./venv3,./build,./cache