isort

Kilo59 · Kilo59 · commit 3c186063a9dd · 2020-03-25T17:53:03.000-04:00
diff --git a/app/data/__init__.py b/app/data/__init__.py
@@ -1,5 +1,5 @@
-from ..services.location.jhu import JhuLocationService
 from ..services.location.csbs import CSBSLocationService
+from ..services.location.jhu import JhuLocationService
 
 # Mapping of services to data-sources.
 data_sources = {"jhu": JhuLocationService(), "csbs": CSBSLocationService()}
diff --git a/app/main.py b/app/main.py
@@ -1,27 +1,24 @@
 """
 app.main.py
 """
+import datetime as dt
 import logging
 import os
 import reprlib
-import datetime as dt
 
 import pydantic
 import uvicorn
-
-from fastapi import FastAPI
-from fastapi import Request, Response
-
-from fastapi.responses import JSONResponse
-
-from fastapi.middleware.wsgi import WSGIMiddleware
+from fastapi import FastAPI, Request, Response
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.middleware.wsgi import WSGIMiddleware
+from fastapi.responses import JSONResponse
 
 from .core import create_app
 from .data import data_source
-
-from .models.location import LocationResponse as Location, LocationsResponse as Locations
 from .models.latest import LatestResponse as Latest
+from .models.location import LocationResponse as Location
+from .models.location import LocationsResponse as Locations
+from .router import router
 
 # ############
 # FastAPI App
@@ -84,7 +81,6 @@ async def handle_validation_error(request: Request, exc: pydantic.error_wrappers
 # Routing
 # ################
 
-from .router import router
 
 # Include routers.
 APP.include_router(router, prefix="/v2", tags=["v2"])
diff --git a/app/models/location.py b/app/models/location.py
@@ -1,7 +1,9 @@
-from pydantic import BaseModel
 from typing import Dict, List
-from .timeline import Timelines
+
+from pydantic import BaseModel
+
 from .latest import Latest
+from .timeline import Timelines
 
 
 class Location(BaseModel):
diff --git a/app/models/timeline.py b/app/models/timeline.py
@@ -1,6 +1,7 @@
-from pydantic import BaseModel
 from typing import Dict
 
+from pydantic import BaseModel
+
 
 class Timeline(BaseModel):
     """
diff --git a/app/router/latest.py b/app/router/latest.py
@@ -1,7 +1,8 @@
 from fastapi import Request
-from . import router
+
 from ..enums.sources import Sources
 from ..models.latest import LatestResponse as Latest
+from . import router
 
 
 @router.get("/latest", response_model=Latest)
diff --git a/app/router/locations.py b/app/router/locations.py
@@ -1,7 +1,9 @@
 from fastapi import Request
-from . import router
+
 from ..enums.sources import Sources
-from ..models.location import LocationResponse as Location, LocationsResponse as Locations
+from ..models.location import LocationResponse as Location
+from ..models.location import LocationsResponse as Locations
+from . import router
 
 
 @router.get("/locations", response_model=Locations, response_model_exclude_unset=True)
diff --git a/app/router/sources.py b/app/router/sources.py
@@ -1,5 +1,5 @@
-from . import router
 from ..data import data_sources
+from . import router
 
 
 @router.get("/sources")
diff --git a/app/routes/v1/all.py b/app/routes/v1/all.py
@@ -1,4 +1,5 @@
 from flask import jsonify
+
 from ...routes import api_v1 as api
 from ...services.location.jhu import get_category
 
diff --git a/app/routes/v1/confirmed.py b/app/routes/v1/confirmed.py
@@ -1,4 +1,5 @@
 from flask import jsonify
+
 from ...routes import api_v1 as api
 from ...services.location.jhu import get_category
 
diff --git a/app/routes/v1/deaths.py b/app/routes/v1/deaths.py
@@ -1,4 +1,5 @@
 from flask import jsonify
+
 from ...routes import api_v1 as api
 from ...services.location.jhu import get_category
 
diff --git a/app/routes/v1/recovered.py b/app/routes/v1/recovered.py
@@ -1,4 +1,5 @@
 from flask import jsonify
+
 from ...routes import api_v1 as api
 from ...services.location.jhu import get_category
 
diff --git a/app/services/location/csbs.py b/app/services/location/csbs.py
@@ -1,6 +1,12 @@
-from . import LocationService
+import csv
+from datetime import datetime
+
+import requests
+from cachetools import TTLCache, cached
+
 from ...coordinates import Coordinates
 from ...location.csbs import CSBSLocation
+from . import LocationService
 
 
 class CSBSLocationService(LocationService):
@@ -16,10 +22,6 @@ def get(self, id):
         return self.get_all()[id]
 
 
-import requests
-import csv
-from datetime import datetime
-from cachetools import cached, TTLCache
 
 # Base URL for fetching data
 base_url = "https://facts.csbs.org/covid-19/covid19_county.csv"
diff --git a/app/services/location/jhu.py b/app/services/location/jhu.py
@@ -1,7 +1,15 @@
-from . import LocationService
-from ...location import TimelinedLocation
+import csv
+from datetime import datetime
+
+import requests
+from cachetools import TTLCache, cached
+
 from ...coordinates import Coordinates
+from ...location import TimelinedLocation
 from ...timeline import Timeline
+from ...utils import countrycodes
+from ...utils import date as date_util
+from . import LocationService
 
 
 class JhuLocationService(LocationService):
@@ -20,11 +28,6 @@ def get(self, id):
 
 # ---------------------------------------------------------------
 
-import requests
-import csv
-from datetime import datetime
-from cachetools import cached, TTLCache
-from ...utils import countrycodes, date as date_util
 
 """
 Base URL for fetching category.
diff --git a/app/timeline.py b/app/timeline.py
@@ -1,5 +1,5 @@
-from datetime import datetime
 from collections import OrderedDict
+from datetime import datetime
 
 
 class Timeline:
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,4 +16,11 @@ exclude = '''
   | build
   | dist
 )/
-'''
+'''
+[tool.isort]
+known_third_party = "invoke,pkg_resources"
+multi_line_output = 3
+include_trailing_comma = "True"
+force_grid_wrap = 0
+use_parentheses = "True"
+line_length = 120
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -6,7 +6,6 @@
 import pytest
 from fastapi.testclient import TestClient
 
-
 from app.main import APP
 
 
diff --git a/tests/test_coordinates.py b/tests/test_coordinates.py
@@ -1,5 +1,7 @@
-import pytest
 from unittest import mock
+
+import pytest
+
 from app import coordinates
 
 
diff --git a/tests/test_countrycodes.py b/tests/test_countrycodes.py
@@ -1,6 +1,8 @@
 import pytest
+
 from app.utils import countrycodes
 
+
 """
 Todo:
     * Test cases for capturing of stdout/stderr
diff --git a/tests/test_csbs.py b/tests/test_csbs.py
@@ -1,7 +1,9 @@
-import app
 import datetime
-import pytest
 from unittest import mock
+
+import pytest
+
+import app
 from app.services.location import csbs
 
 
diff --git a/tests/test_date.py b/tests/test_date.py
@@ -1,4 +1,5 @@
 import pytest
+
 from app.utils import date
 
 
diff --git a/tests/test_jhu.py b/tests/test_jhu.py
@@ -1,10 +1,12 @@
-import app
 import datetime
-import pytest
 from unittest import mock
-from app.utils import date
+
+import pytest
+
+import app
 from app import location
 from app.services.location import jhu
+from app.utils import date
 
 DATETIME_STRING = "2020-03-17T10:23:22.505550"
 
diff --git a/tests/test_location.py b/tests/test_location.py
@@ -1,7 +1,9 @@
-import pytest
 from datetime import datetime
 from unittest import mock
-from app import location, coordinates, timeline
+
+import pytest
+
+from app import coordinates, location, timeline
 
 
 def mocked_timeline(*args, **kwargs):
diff --git a/tests/test_routes.py b/tests/test_routes.py
@@ -1,14 +1,16 @@
-import app
-import unittest
-from fastapi.testclient import TestClient
 import json
-from unittest import mock
+import unittest
 from pprint import pformat as pf
+from unittest import mock
+
 import pytest
+from fastapi.testclient import TestClient
+
+import app
 from app import services
 from app.main import APP
 
-from .test_jhu import mocked_requests_get, mocked_strptime_isoformat, DATETIME_STRING
+from .test_jhu import DATETIME_STRING, mocked_requests_get, mocked_strptime_isoformat
 
 
 @mock.patch("app.services.location.jhu.datetime")
diff --git a/tests/test_timeline.py b/tests/test_timeline.py
@@ -1,6 +1,8 @@
-import pytest
-from unittest import mock
 from collections import OrderedDict
+from unittest import mock
+
+import pytest
+
 from app import timeline
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from flask import jsonify`
	`2`	`+`
`2`	`3`	`from ...routes import api_v1 as api`
`3`	`4`	`from ...services.location.jhu import get_category`
`4`	`5`