From 07170082e3c01c71605594222d10c2a73e76bfa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Sun, 1 Sep 2019 09:45:45 +0200
Subject: [PATCH] Remove setup.cfg, move relevant flake8 arguments into
 pre-commit config. Update pre-commit hooks.

---
 .pre-commit-config.yaml |  6 ++++--
 setup.cfg               | 13 -------------
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 setup.cfg

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0c7675a..6614006 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,15 +1,17 @@
 repos:
 - repo: git://github.com/pre-commit/pre-commit-hooks
-  rev: v1.3.0
+  rev: v2.3.0
   hooks:
   - id: trailing-whitespace
   - id: flake8
+    args: [--max-line-length=120, --exclude=*/migrations/*]
   - id: check-yaml
   - id: check-added-large-files
   - id: debug-statements
   - id: end-of-file-fixer
+  - id: check-toml
 - repo: https://github.com/asottile/reorder_python_imports
-  rev: v1.0.1
+  rev: v1.6.1
   hooks:
     - id: reorder-python-imports
       types: [file, python]
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 7235929..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-[flake8]
-ignore = E226,E302,E41
-max-line-length = 160
-max-complexity = 10
-exclude = */migrations/*
-
-[isort]
-atomic = true
-multi_line_output = 5
-line_length = 160
-indent = '    '
-combine_as_imports = true
-skip = wsgi.py,.eggs,setup.py