Merge branch 'master' into flake8-updates

# Conflicts:
#	.flake8
#	Pipfile
#	Pipfile.lock

7 files changed, 66 insertions, 23 deletions

diff --git a/.flake8 b/.flake8
index c897cb6..cc5f423 100644
--- a/.flake8
+++ b/.flake8
@@ -1,6 +1,6 @@
 [flake8]
 max-line-length=100
-application_import_names=snekbox
+application_import_names=snekbox,config,logs
 ignore=
     P102,B311,W503,E226,S311,
     # Missing Docstrings
diff --git a/Pipfile b/Pipfile
index 11e9243..e881d52 100644
--- a/Pipfile
+++ b/Pipfile
@@ -19,12 +19,18 @@ pytest-dependency = "*"
 pre-commit = "*"
 flake8 = "*"
 flake8-docstrings = "*"
+flake8-bugbear = "*"
+flake8-import-order = "*"
+flake8-tidy-imports = "*"
+flake8-todo = "*"
+flake8-string-format = "*"
 
 [requires]
 python_version = "3.6"
 
 [scripts]
 lint = "flake8"
+precommit = "pre-commit install"
 test = "py.test tests --cov . --cov-report term-missing -v"
 report = "py.test tests --cov . --cov-report=html"
 snekbox = "python snekbox.py"
diff --git a/Pipfile.lock b/Pipfile.lock
index c3345ea..a7b5238 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "14e7fbb150e60081c3a3da5356fda2217af27659efbf86123eb7151d44a08963"
+            "sha256": "5560465709134fb6096835f67c91567819bc6239a2f0182b2fca70ec3d0fb3f5"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -32,11 +32,11 @@
         },
         "docker": {
             "hashes": [
-                "sha256:2840ffb9dc3ef6d00876bde476690278ab13fa1f8ba9127ef855ac33d00c3152",
-                "sha256:5831256da3477723362bc71a8df07b8cd8493e4a4a60cebd45580483edbe48ae"
+                "sha256:0076504c42b6a671c8e7c252913f59852669f5f882522f4d320ec7613b853553",
+                "sha256:d2c14d2cc7d54818897cc6f3cf73923c4e7dfe12f08f7bddda9dbea7fa82ea36"
             ],
             "index": "pypi",
-            "version": "==3.7.0"
+            "version": "==3.7.1"
         },
         "docker-pycreds": {
             "hashes": [
@@ -83,10 +83,10 @@
         },
         "websocket-client": {
             "hashes": [
-                "sha256:47a3ddf3ee7ecd4e2f81610bcdc7f44d5dd03b602b911d4ce991cd82310d3f3b",
-                "sha256:f6029deea21218f2c771848935aa26c15699c831770f4fa66958bdaabff80ca0"
+                "sha256:1151d5fb3a62dc129164292e1227655e4bbc5dd5340a5165dfae61128ec50aa9",
+                "sha256:1fd5520878b68b84b5748bb30e592b10d0a91529d5383f74f4964e72b297fd3a"
             ],
-            "version": "==0.55.0"
+            "version": "==0.56.0"
         }
     },
     "develop": {
@@ -176,6 +176,14 @@
             "index": "pypi",
             "version": "==3.7.7"
         },
+        "flake8-bugbear": {
+            "hashes": [
+                "sha256:07b6e769d7f4e168d590f7088eae40f6ddd9fa4952bed31602def65842682c83",
+                "sha256:0ccf56975f4db1d69dc1cf3598c99d768ebf95d0cad27d76087954aa399b515a"
+            ],
+            "index": "pypi",
+            "version": "==18.8.0"
+        },
         "flake8-docstrings": {
             "hashes": [
                 "sha256:4e0ce1476b64e6291520e5570cf12b05016dd4e8ae454b8a8a9a48bc5f84e1cd",
@@ -184,6 +192,14 @@
             "index": "pypi",
             "version": "==1.3.0"
         },
+        "flake8-import-order": {
+            "hashes": [
+                "sha256:90a80e46886259b9c396b578d75c749801a41ee969a235e163cfe1be7afd2543",
+                "sha256:a28dc39545ea4606c1ac3c24e9d05c849c6e5444a50fb7e9cdd430fc94de6e92"
+            ],
+            "index": "pypi",
+            "version": "==0.18.1"
+        },
         "flake8-polyfill": {
             "hashes": [
                 "sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9",
@@ -191,6 +207,29 @@
             ],
             "version": "==1.0.2"
         },
+        "flake8-string-format": {
+            "hashes": [
+                "sha256:68ea72a1a5b75e7018cae44d14f32473c798cf73d75cbaed86c6a9a907b770b2",
+                "sha256:774d56103d9242ed968897455ef49b7d6de272000cfa83de5814273a868832f1"
+            ],
+            "index": "pypi",
+            "version": "==0.2.3"
+        },
+        "flake8-tidy-imports": {
+            "hashes": [
+                "sha256:1c476aabc6e8db26dc75278464a3a392dba0ea80562777c5f13fd5cdf2646154",
+                "sha256:b3f5b96affd0f57cacb6621ed28286ce67edaca807757b51227043ebf7b136a1"
+            ],
+            "index": "pypi",
+            "version": "==2.0.0"
+        },
+        "flake8-todo": {
+            "hashes": [
+                "sha256:6e4c5491ff838c06fe5a771b0e95ee15fc005ca57196011011280fc834a85915"
+            ],
+            "index": "pypi",
+            "version": "==0.7"
+        },
         "flask": {
             "hashes": [
                 "sha256:2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48",
@@ -477,10 +516,10 @@
         },
         "werkzeug": {
             "hashes": [
-                "sha256:590abe38f8be026d78457fe3b5200895b3543e58ac3fc1dd792c6333ea11af64",
-                "sha256:ee11b0f0640c56fb491b43b38356c4b588b3202b415a1e03eacf1c5561c961cf"
+                "sha256:96da23fa8ccecbc3ae832a83df5c722c11547d021637faacb0bec4dd2f4666c8",
+                "sha256:ca5c2dcd367d6c0df87185b9082929d255358f5391923269335782b213d52655"
             ],
-            "version": "==0.15.0"
+            "version": "==0.15.1"
         },
         "zipp": {
             "hashes": [
diff --git a/config.py b/config.py
index 4e9db6f..5ca23bb 100644
--- a/config.py
+++ b/config.py
@@ -1,4 +1,5 @@
 import os
+
 import docker
 from docker.errors import NotFound
 
diff --git a/rmq.py b/rmq.py
index a0dade7..ebb9e6d 100644
--- a/rmq.py
+++ b/rmq.py
@@ -1,18 +1,17 @@
-import pika
 import time
 import traceback
 
+import pika
 from pika.exceptions import ConnectionClosed
 
-from config import USERNAME
-from config import PASSWORD
+from config import EXCHANGE
+from config import EXCHANGE_TYPE
 from config import HOST
+from config import PASSWORD
 from config import PORT
-from config import EXCHANGE_TYPE
 from config import QUEUE
 from config import ROUTING_KEY
-from config import EXCHANGE
-
+from config import USERNAME
 from logs import log
 
 
diff --git a/snekbox.py b/snekbox.py
index 5f7b42f..a5cebde 100644
--- a/snekbox.py
+++ b/snekbox.py
@@ -1,7 +1,7 @@
 import json
 import multiprocessing
-import subprocess
 import os
+import subprocess
 import sys
 
 from rmq import Rmq
diff --git a/snekweb.py b/snekweb.py
index 2ed1034..f965323 100644
--- a/snekweb.py
+++ b/snekweb.py
@@ -1,13 +1,11 @@
-import traceback
-import threading
-import logging
 import json
+import logging
+import threading
+import traceback
 
 from flask import Flask
 from flask import render_template
 from flask_sockets import Sockets
-
-
 from rmq import Rmq
 
 # Load app