Merge 510ff91 into ae080f4

.coveragerc

@@ -4,4 +4,3 @@ omit =
     .tox/*
     setup.py
     *.egg/*
-

.flake8

@@ -0,0 +1,6 @@
+[flake8]
+ignore = E203, E266, E501, W503
+max-line-length = 80
+max-complexity = 18
+select = B,C,E,F,W,T4,B9
+exclude = docs/conf.py,.tox

.pre-commit-config.yaml

@@ -0,0 +1,31 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 19.3b0
+    hooks:
+      - id: black
+        language_version: python3.7
+
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.8
+    hooks:
+      - id: flake8
+        language_version: python3.7
+
+  - repo: https://github.com/asottile/seed-isort-config
+    rev: v1.9.3
+    hooks:
+      - id: seed-isort-config
+
+  - repo: https://github.com/pre-commit/mirrors-isort
+    rev: v4.3.21
+    hooks:
+      - id: isort
+        additional_dependencies: [toml]
+        language_version: python3.7
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: debug-statements

.travis.yml

@@ -2,15 +2,15 @@ language: python
 matrix:
   include:
     - python: 2.7
-      env: TOXENV=flake8,py27-crypto,py27-nocrypto,py27-contrib_crypto
+      env: TOXENV=py27-crypto,py27-nocrypto,py27-contrib_crypto
     - python: 3.4
-      env: TOXENV=flake8,py34-crypto,py34-nocrypto
+      env: TOXENV=py34-crypto,py34-nocrypto
     - python: 3.5
-      env: TOXENV=flake8,mypy,py35-crypto,py35-nocrypto,py35-contrib_crypto
+      env: TOXENV=py35-crypto,py35-nocrypto,py35-contrib_crypto
     - python: 3.6
-      env: TOXENV=flake8,mypy,py36-crypto,py36-nocrypto,py36-contrib_crypto
+      env: TOXENV=py36-crypto,py36-nocrypto,py36-contrib_crypto
     - python: 3.7
-      env: TOXENV=flake8,mypy,py37-crypto,py37-nocrypto,py37-contrib_crypto
+      env: TOXENV=lint,typing,py37-crypto,py37-nocrypto,py37-contrib_crypto
       dist: xenial
 install:
   - pip install -U pip

AUTHORS

@@ -25,5 +25,5 @@ Patches and Suggestions
  - Michael Davis <mike.philip.davis@gmail.com> <mike.davis@workiva.com>
 
  - Vinod Gupta <codervinod@gmail.com>
- 
+
  - Derek Weitzel <djw8605@gmail.com>