Formatting.

Author: toddbirchard

Makefile

@@ -12,10 +12,11 @@ make clean      - Remove cached files and lock files.
 endef
 export HELP
 
-.PHONY: run restart deploy update clean help
+.PHONY: run deploy update format clean help
 
 
 requirements: .requirements.txt
+env: .venv/bin/activate
 
 
 .requirements.txt: requirements.txt
@@ -27,8 +28,8 @@ all help:
 
 
 .PHONY: run
-run:
-	$(shell . .venv/bin/activate && python3 wsgi.py)
+run: env
+	$(shell . .venv/bin/activate && flask run)
 
 
 .PHONY: deploy
@@ -37,17 +38,16 @@ deploy:
 
 
 .PHONY: update
-update:
-	poetry shell && poetry update
-	pip freeze > requirements.txt
-	exit
+update: env
+	.venv/bin/python3 -m pip install -U pip
+	poetry update
+	poetry export -f requirements.txt --output requirements.txt --without-hashes
 
 
 .PHONY: format
-format: requirements
-	$(shell . .venv/bin/activate)
-	$(shell isort -rc ./)
-	$(shell black ./)
+format: env
+	$(shell . .venv/bin/activate && isort -rc ./)
+	$(shell . .venv/bin/activate && black ./)
 
 
 .PHONY: clean

Pipfile

@@ -1,25 +1,26 @@
 """Flask config."""
 from os import environ, path
+
 from dotenv import load_dotenv
 
 BASE_DIR = path.abspath(path.dirname(__file__))
-load_dotenv(path.join(BASE_DIR, '.env'))
+load_dotenv(path.join(BASE_DIR, ".env"))
 
 
 class Config:
     """Flask configuration variables."""
 
     # General Config
-    FLASK_APP = environ.get('FLASK_APP')
-    FLASK_ENV = environ.get('FLASK_ENV')
-    SECRET_KEY = environ.get('SECRET_KEY')
+    FLASK_APP = environ.get("FLASK_APP")
+    FLASK_ENV = environ.get("FLASK_ENV")
+    SECRET_KEY = environ.get("SECRET_KEY")
 
     # Assets
-    LESS_BIN = environ.get('LESS_BIN')
-    ASSETS_DEBUG = environ.get('ASSETS_DEBUG')
-    LESS_RUN_IN_DEBUG = environ.get('LESS_RUN_IN_DEBUG')
+    LESS_BIN = environ.get("LESS_BIN")
+    ASSETS_DEBUG = environ.get("ASSETS_DEBUG")
+    LESS_RUN_IN_DEBUG = environ.get("LESS_RUN_IN_DEBUG")
 
     # Static Assets
-    STATIC_FOLDER = 'static'
-    TEMPLATES_FOLDER = 'templates'
-    COMPRESSOR_DEBUG = environ.get('COMPRESSOR_DEBUG')
+    STATIC_FOLDER = "static"
+    TEMPLATES_FOLDER = "templates"
+    COMPRESSOR_DEBUG = environ.get("COMPRESSOR_DEBUG")

Pipfile.lock

@@ -2,12 +2,12 @@
 
 if [ -d ".venv" ]
 then
-    source .venv/bin/activate
+    . .venv/bin/activate
     pip install -r requirements.txt
     python3 wsgi.py
 else
     python3 -m venv .venv
-    source .venv/bin/activate
+    . .venv/bin/activate
     python3 -m pip install --upgrade pip
     pip install -r requirements.txt
     python3 wsgi.py

config.py

@@ -6,7 +6,7 @@
 def init_app():
     """Construct core Flask application with embedded Dash app."""
     app = Flask(__name__, instance_relative_config=False)
-    app.config.from_object('config.Config')
+    app.config.from_object("config.Config")
     assets = Environment()
     assets.init_app(app)
 
@@ -17,6 +17,7 @@ def init_app():
 
         # Import Dash application
         from .plotlydash.dashboard import init_dashboard
+
         app = init_dashboard(app)
 
         # Compile static assets

deploy.sh

@@ -13,12 +13,12 @@ def compile_static_assets(assets):
     assets.auto_build = True
     assets.debug = False
     less_bundle = Bundle(
-        'less/*.less',
-        filters='less,cssmin',
-        output='dist/css/styles.css',
-        extra={'rel': 'stylesheet/less'}
+        "less/*.less",
+        filters="less,cssmin",
+        output="dist/css/styles.css",
+        extra={"rel": "stylesheet/less"},
     )
-    assets.register('less_all', less_bundle)
-    if app.config['FLASK_ENV'] == 'development':
+    assets.register("less_all", less_bundle)
+    if app.config["FLASK_ENV"] == "development":
         less_bundle.build()
     return assets

plotlyflask_tutorial/__init__.py

@@ -1,10 +1,11 @@
 """Instantiate a Dash app."""
-import numpy as np
-import pandas as pd
 import dash
-import dash_table
-import dash_html_components as html
 import dash_core_components as dcc
+import dash_html_components as html
+import dash_table
+import numpy as np
+import pandas as pd
+
 from .data import create_dataframe
 from .layout import html_layout
 
@@ -13,11 +14,11 @@ def init_dashboard(server):
     """Create a Plotly Dash dashboard."""
     dash_app = dash.Dash(
         server=server,
-        routes_pathname_prefix='/dashapp/',
+        routes_pathname_prefix="/dashapp/",
         external_stylesheets=[
-            '/static/dist/css/styles.css',
-            'https://fonts.googleapis.com/css?family=Lato'
-        ]
+            "/static/dist/css/styles.css",
+            "https://fonts.googleapis.com/css?family=Lato",
+        ],
     )
 
     # Load DataFrame
@@ -28,38 +29,41 @@ def init_dashboard(server):
 
     # Create Layout
     dash_app.layout = html.Div(
-        children=[dcc.Graph(
-            id='histogram-graph',
-            figure={
-                'data': [{
-                    'x': df['complaint_type'],
-                    'text': df['complaint_type'],
-                    'customdata': df['key'],
-                    'name': '311 Calls by region.',
-                    'type': 'histogram'
-                }],
-                'layout': {
-                    'title': 'NYC 311 Calls category.',
-                    'height': 500,
-                    'padding': 150
-                }
-            }),
-            create_data_table(df)
+        children=[
+            dcc.Graph(
+                id="histogram-graph",
+                figure={
+                    "data": [
+                        {
+                            "x": df["complaint_type"],
+                            "text": df["complaint_type"],
+                            "customdata": df["key"],
+                            "name": "311 Calls by region.",
+                            "type": "histogram",
+                        }
+                    ],
+                    "layout": {
+                        "title": "NYC 311 Calls category.",
+                        "height": 500,
+                        "padding": 150,
+                    },
+                },
+            ),
+            create_data_table(df),
         ],
-        id='dash-container'
+        id="dash-container",
     )
     return dash_app.server
 
 
 def create_data_table(df):
     """Create Dash datatable from Pandas DataFrame."""
     table = dash_table.DataTable(
-        id='database-table',
+        id="database-table",
         columns=[{"name": i, "id": i} for i in df.columns],
-        data=df.to_dict('records'),
+        data=df.to_dict("records"),
         sort_action="native",
-        sort_mode='native',
-        page_size=300
+        sort_mode="native",
+        page_size=300,
     )
     return table
-

plotlyflask_tutorial/assets.py

@@ -1,14 +1,14 @@
 """Prepare data for Plotly Dash."""
-import pandas as pd
 import numpy as np
+import pandas as pd
 
 
 def create_dataframe():
     """Create Pandas DataFrame from local CSV."""
-    df = pd.read_csv('data/311-calls.csv', parse_dates=['created'])
-    df['created'] = df['created'].dt.date
-    df.drop(columns=['incident_zip'], inplace=True)
-    num_complaints = df['complaint_type'].value_counts()
+    df = pd.read_csv("data/311-calls.csv", parse_dates=["created"])
+    df["created"] = df["created"].dt.date
+    df.drop(columns=["incident_zip"], inplace=True)
+    num_complaints = df["complaint_type"].value_counts()
     to_remove = num_complaints[num_complaints <= 30].index
     df.replace(to_remove, np.nan, inplace=True)
     return df

plotlyflask_tutorial/plotlydash/dashboard.py

@@ -1,6 +1,6 @@
 """Plotly Dash HTML layout override."""
 
-html_layout = '''
+html_layout = """
 <!DOCTYPE html>
     <html>
         <head>
@@ -28,4 +28,4 @@
             </footer>
         </body>
     </html>
-'''
+"""