Merge pull request #190 from Kilo59/format

apply black/isort formatting/sorting

Author: ExpDev07

.travis.yml

@@ -7,4 +7,4 @@ install:
   - "pip install pipenv"
   - "pipenv install --dev --skip-lock"
 script:
-  - "make test lint"
+  - "make test lint check-fmt"

Makefile

@@ -19,3 +19,11 @@ test:
 
 lint:
 	pylint $(APP) || true
+
+fmt:
+	isort --apply --atomic
+	black . -l 120
+
+check-fmt:
+	isort -rc --check
+	black . --check --diff

Pipfile

@@ -5,6 +5,8 @@ verify_ssl = true
 
 [dev-packages]
 bandit = "*"
+black = "==19.10b0"
+isort = "*"
 pytest = "*"
 pylint = "*"
 
@@ -25,3 +27,5 @@ python_version = "3.8"
 [scripts]
 dev = "uvicorn app.main:APP --reload"
 start = "uvicorn app.main:APP"
+fmt = "black . -l 120"
+sort = "isort --apply --atomic"

Pipfile.lock

@@ -13,6 +13,7 @@ Support multiple data-sources.
 [![GitHub last commit](https://img.shields.io/github/last-commit/ExpDev07/coronavirus-tracker-api)](https://github.com/ExpDev07/coronavirus-tracker-api/commits/master)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/ExpDev07/coronavirus-tracker-api)](https://github.com/ExpDev07/coronavirus-tracker-api/pulls)
 [![GitHub issues](https://img.shields.io/github/issues/ExpDev07/coronavirus-tracker-api)](https://github.com/ExpDev07/coronavirus-tracker-api/issues)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Tweet](https://img.shields.io/twitter/url?url=https%3A%2F%2Fgithub.com%2FExpDev07%2Fcoronavirus-tracker-api)](https://twitter.com/intent/tweet?text=COVID19%20Live%20Tracking%20API:%20&url=https%3A%2F%2Fgithub.com%2FExpDev07%2Fcoronavirus-tracker-api)
 
 **Live global stats (provided by [fight-covid19/bagdes](https://github.com/fight-covid19/bagdes)) from this API:**

README.md

@@ -1,4 +1,4 @@
 # See PEP396.
-__version__ = '2.0'
+__version__ = "2.0"
 
 from .core import create_app

app/__init__.py

@@ -2,9 +2,10 @@
 
 # Load enviroment variables from .env file.
 from dotenv import load_dotenv
+
 load_dotenv()
 
 """
 The port to serve the app application on.
 """
-PORT = int(os.getenv('PORT', 5000))
+PORT = int(os.getenv("PORT", 5000))

app/config/settings.py

@@ -14,10 +14,7 @@ def serialize(self):
         :returns: The serialized coordinates.
         :rtype: dict
         """
-        return {
-            'latitude' : self.latitude,
-            'longitude': self.longitude
-        }
+        return {"latitude": self.latitude, "longitude": self.longitude}
 
     def __str__(self):
-        return 'lat: %s, long: %s' % (self.latitude, self.longitude)
+        return "lat: %s, long: %s" % (self.latitude, self.longitude)

app/coordinates.py

@@ -1,6 +1,7 @@
 from flask import Flask
 from flask_cors import CORS
 
+
 def create_app():
     """
     Construct the core application.
@@ -10,7 +11,7 @@ def create_app():
     CORS(app)
 
     # Set app config from settings.
-    app.config.from_pyfile('config/settings.py');
+    app.config.from_pyfile("config/settings.py")
 
     with app.app_context():
         # Import routes.

app/core.py

@@ -1,11 +1,9 @@
-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()
-}
+data_sources = {"jhu": JhuLocationService(), "csbs": CSBSLocationService()}
+
 
 def data_source(source):
     """
@@ -14,4 +12,4 @@ def data_source(source):
     :returns: The service.
     :rtype: LocationService
     """
-    return data_sources.get(source.lower())
+    return data_sources.get(source.lower())