From 9168ac32de83136a7728558885e158ba568a2319 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Wed, 12 Dec 2018 22:34:51 +0000
Subject: [PATCH] Move router to its own app

---
 catfish/{worker/router.py => router/__init__.py} |  0
 catfish/worker/__init__.py                       | 11 ++++++-----
 setup.cfg                                        |  1 +
 tests/__init__.py                                | 14 ++++++++------
 tests/test_worker/test_router.py                 |  6 ------
 5 files changed, 15 insertions(+), 17 deletions(-)
 rename catfish/{worker/router.py => router/__init__.py} (100%)
 delete mode 100644 tests/test_worker/test_router.py

diff --git a/catfish/worker/router.py b/catfish/router/__init__.py
similarity index 100%
rename from catfish/worker/router.py
rename to catfish/router/__init__.py
diff --git a/catfish/worker/__init__.py b/catfish/worker/__init__.py
index 837883c..a9f1e21 100644
--- a/catfish/worker/__init__.py
+++ b/catfish/worker/__init__.py
@@ -1,11 +1,12 @@
-import time
+import asyncio
 import os
 import tempfile
-import psutil
-from catfish.utils.processes import terminate_processes
-import asyncio
-from .router import run_server
+import time
 
+import psutil
+
+from catfish.router import run_server
+from catfish.utils.processes import terminate_processes
 
 PID_FILE = os.path.join(tempfile.gettempdir(), "catfish.pid")
 
diff --git a/setup.cfg b/setup.cfg
index 9eea40a..e854a07 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,3 +4,4 @@ include_trailing_comma=True
 force_grid_wrap=0
 use_parentheses=True
 line_length=88
+not_skip=__init__.py
diff --git a/tests/__init__.py b/tests/__init__.py
index 27db563..ce37a8a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,12 +1,14 @@
-from aiounittest import AsyncTestCase
-from aiohttp.test_utils import unused_port
-from click.testing import CliRunner
-from catfish.__main__ import cli
-from catfish import worker
-from catfish.utils.processes import terminate_processes, CURRENT_PROCESS
 import functools
 from multiprocessing import Process
 
+from aiohttp.test_utils import unused_port
+from aiounittest import AsyncTestCase
+from click.testing import CliRunner
+
+from catfish import worker
+from catfish.__main__ import cli
+from catfish.utils.processes import CURRENT_PROCESS, terminate_processes
+
 
 class BaseTestCase(AsyncTestCase):
     def setUp(self):
diff --git a/tests/test_worker/test_router.py b/tests/test_worker/test_router.py
deleted file mode 100644
index 2e5aab6..0000000
--- a/tests/test_worker/test_router.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from tests import BaseWorkerTestCase
-
-
-class RouterTestCase(BaseWorkerTestCase):
-    def test_thing(self):
-        self.assertTrue(True)