Use consistent import ordering

tests/test_config.py

@@ -1,8 +1,10 @@
+import yaml
 from unittest import TestCase
+
 from fs.memoryfs import MemoryFS
+
 from tilekiln.config import Config, LayerConfig
 from tilekiln.tile import Tile
-import yaml
 
 
 class TestConfig(TestCase):

tests/test_definition.py

@@ -1,5 +1,7 @@
 from unittest import TestCase
+
 from fs.memoryfs import MemoryFS
+
 from tilekiln.definition import Definition
 from tilekiln.tile import Tile
 

tests/test_tile.py

@@ -1,4 +1,5 @@
 from unittest import TestCase
+
 from tilekiln.tile import Tile
 
 

tilekiln/__init__.py

@@ -1,9 +1,11 @@
-import tilekiln.config
+import os
+
 import fs.osfs
 
-import os
+import tilekiln.config
 
 
+# TODO: Put somewhere else
 def load_config(path):
     '''Loads a config from the filesystem, given a path'''
 

tilekiln/config.py

@@ -1,5 +1,6 @@
-import yaml
 import json
+import yaml
+
 from tilekiln.definition import Definition
 from tilekiln.tile import Tile
 

tilekiln/dev/__init__.py

@@ -1,12 +1,14 @@
+import os
+
+import psycopg
 from fastapi import FastAPI, Response, HTTPException
 from fastapi.responses import RedirectResponse
 from fastapi.middleware.cors import CORSMiddleware
+
 import tilekiln
 from tilekiln.kiln import Kiln
 from tilekiln.config import Config
 from tilekiln.tile import Tile
-import os
-import psycopg
 
 
 # Constants for environment variable names

tilekiln/kiln.py

@@ -1,13 +1,14 @@
-'''
-The kiln is what actually generates the tiles, using the config to compute SQL,
-and a DB connection to execute it
-'''
+import psycopg
+
 from tilekiln.config import Config
 from tilekiln.tile import Tile
-import psycopg
 
 
 class Kiln:
+    '''
+    The kiln is what actually generates the tiles, using the config to compute SQL,
+    and a DB connection to execute it
+    '''
     def __init__(self, config: Config, connection: psycopg.Connection):
         self.__config = config
         self.__connection = connection

tilekiln/prometheus.py

@@ -1,9 +1,11 @@
-import prometheus_client
-from tilekiln.storage import Storage
 import time
+
+import prometheus_client
 from prometheus_client.registry import Collector
 from prometheus_client.core import GaugeMetricFamily, REGISTRY
 
+from tilekiln.storage import Storage
+
 # Disable default metrics since we're not monitoring this process, we're monitoring
 # the DB sizes
 REGISTRY.unregister(prometheus_client.GC_COLLECTOR)

tilekiln/scripts/__init__.py

@@ -1,15 +1,17 @@
+import os
+import sys
+
 import click
+import psycopg
+import psycopg_pool
+import uvicorn
+
 import tilekiln
-from tilekiln.tile import Tile
-import sys
 import tilekiln.dev
 import tilekiln.server
+from tilekiln.tile import Tile
 from tilekiln.storage import Storage
 from tilekiln.kiln import Kiln
-import uvicorn
-import psycopg
-import psycopg_pool
-import os
 
 
 # Allocated as per https://github.com/prometheus/prometheus/wiki/Default-port-allocations

tilekiln/server/__init__.py

@@ -1,13 +1,15 @@
+import os
+
+import psycopg
+import psycopg_pool
 from fastapi import FastAPI, Response, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
+
 import tilekiln
 from tilekiln.config import Config
 from tilekiln.kiln import Kiln
 from tilekiln.tile import Tile
 from tilekiln.storage import Storage
-import os
-import psycopg
-import psycopg_pool
 
 
 # Constants for environment variable names

tilekiln/storage.py

@@ -1,15 +1,16 @@
-
-from tilekiln.config import Config
-from tilekiln.tile import Tile
-from tilekiln.metric import Metric
-from psycopg_pool import ConnectionPool
-import psycopg.rows
-import click
 import sys
 import gzip
 import json
 from collections.abc import Iterator
 
+import click
+import psycopg.rows
+from psycopg_pool import ConnectionPool
+
+from tilekiln.config import Config
+from tilekiln.metric import Metric
+from tilekiln.tile import Tile
+
 METADATA_TABLE = "metadata"
 GENERATE_STATS_TABLE = "generate_stats"
 TILE_STATS_TABLE = "tile_stats"