menu flag fire

.flake8

@@ -0,0 +1,7 @@
+[flake8]
+# Thanks https://www.reddit.com/r/learnpython/comments/rr6y69/comment/hqeqt68/?utm_source=share&utm_medium=web2x&context=3
+ignore = E203, W503, E501
+
+max-line-length = 88
+max-complexity = 39
+extend-ignore = E203

.github/workflows/black.yml

@@ -0,0 +1,12 @@
+---
+# Thanks https://black.readthedocs.io/en/stable/integrations/github_actions.html
+name: Lint (black)
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: psf/[email protected]

freezing/web/__init__.py

@@ -1,6 +1,3 @@
-import os
-import os.path
-
 from flask import Flask, session, g
 
 from freezing.model import init_model, meta
@@ -25,7 +22,6 @@
     alt_scoring,
     tribes,
 )
-from freezing.web.utils import auth
 
 # Register our blueprints
 

freezing/web/config.py

@@ -90,9 +90,9 @@ def init_logging(loglevel: int = logging.INFO, color: bool = False):
         logging.root,
     ]
 
-    for l in loggers:
-        if l is logging.root:
-            l.setLevel(logging.DEBUG)
+    for logger in loggers:
+        if logger is logging.root:
+            logger.setLevel(logging.DEBUG)
         else:
-            l.setLevel(logging.INFO)
-        l.addHandler(ch)
+            logger.setLevel(logging.INFO)
+        logger.addHandler(ch)

freezing/web/data.py

@@ -1,13 +1,13 @@
 """
 Functions for interacting with the datastore and the strava apis.
 """
+
 from __future__ import division, unicode_literals
 import re
 import logging
 
 from instagram import InstagramAPIError, InstagramClientError
 
-from polyline.codec import PolylineCodec
 
 from sqlalchemy import and_
 from geoalchemy import WKTSpatialElement
@@ -29,7 +29,7 @@
     Team,
 )
 
-from freezing.web import app, config
+from freezing.web import config
 from freezing.web.autolog import log
 from freezing.web.exc import (
     InvalidAuthorizationToken,

freezing/web/templates/base.html

@@ -139,6 +139,8 @@
                             <li><a href="/pointless/generic/londonbridge">London Bridge Rides</a></li>
                             <li><a href="/pointless/arlington">Loopy for Arlington</a></li>
                             <li><a href="https://www.bikearlingtonforum.com/forums/topic/meh-diocrity-pointless-prize-2/">Meh-diocrity</a></li>
+                            <li><a href="/pointless/hashtag/fire">Fire</a></li>
+                            <li><a href="/pointless/hashtag/flag">Flag</a></li>
                             <li><a href="/pointless/opmdays">Michigander Snow Day Rides</a></li>
                             <li><a href="/pointless/hashtag/monuments">Monuments and Memorials</a></li>
                             <!-- li><a href="/pointless/hashtag/oldGeorge">Old Georgetown Bike Lane</a></li -->

freezing/web/utils/auth.py

@@ -1,6 +1,7 @@
 """
 Some authentication-related utility functions/classes.
 """
+
 import logging
 from functools import wraps, update_wrapper
 from datetime import timedelta

freezing/web/utils/dates.py

@@ -1,9 +1,6 @@
-import pytz
-
-from datetime import datetime
 from dateutil import parser as date_parser
 
-from freezing.web import app, config
+from freezing.web import config
 
 
 def parse_competition_timestamp(ts):

freezing/web/utils/genericboard.py

@@ -1,13 +1,11 @@
 import decimal
 import os
-import enum
 from datetime import datetime
 from typing import List, Dict, Any, Tuple
 
 import yaml
 
 from marshmallow import fields
-from marshmallow_enum import EnumField
 
 from freezing.model import meta
 from freezing.model.msg import BaseSchema, BaseMessage

freezing/web/utils/gviz_api.py

@@ -42,8 +42,6 @@
 class DataTableException(Exception):
     """The general exception object thrown by DataTable."""
 
-    pass
-
 
 class DataTableJSONEncoder(json.JSONEncoder):
     """JSON encoder that handles date/time/datetime objects correctly."""

freezing/web/utils/hashboard.py

@@ -1,4 +1,3 @@
-import decimal
 import os
 from typing import List
 

freezing/web/utils/insta.py

@@ -1,12 +1,13 @@
 """
 Utility functions for working with images.
 """
+
 import os
 import urllib
 import shutil
 
 from instagram.client import InstagramAPI
-from freezing.web import app, exc
+from freezing.web import exc
 from freezing.web.config import config
 
 THUMBNAIL_DIMS = (150, 150)

freezing/web/utils/wktutils.py

@@ -1,5 +1,4 @@
 import re
-from decimal import Decimal
 from collections import namedtuple
 
 _point_rx = re.compile("^POINT\((.+)\)$")

freezing/web/views/alt_scoring.py

@@ -8,7 +8,11 @@
 from freezing.model import meta
 
 from freezing.web import config
-from freezing.web.views.shared_sql import *
+from freezing.web.views.shared_sql import (
+    team_sleaze_query,
+    team_segment_query,
+    indiv_freeze_query,
+)
 
 
 blueprint = Blueprint("alt_scoring", __name__)
@@ -18,9 +22,9 @@
 def team_riders():
     q = text(
         """
-		select b.name, count(a.athlete_id) as ride_days from daily_scores a join teams b
-		on a.team_id = b.id where a.distance > 1 and b.leaderboard_exclude=0 group by a.team_id order by ride_days desc;
-		"""
+        select b.name, count(a.athlete_id) as ride_days from daily_scores a join teams b
+        on a.team_id = b.id where a.distance > 1 and b.leaderboard_exclude=0 group by a.team_id order by ride_days desc;
+        """
     )
     team_riders = [
         (x["name"], x["ride_days"]) for x in meta.scoped_session().execute(q).fetchall()

freezing/web/views/api.py

@@ -3,19 +3,17 @@
 import json
 
 import arrow
-import geojson
 from flask import Blueprint, jsonify, request
 import pytz
 from sqlalchemy import text
-from stravalib import unithelper as uh
 
 from freezing.model import meta
 from freezing.model.orm import RidePhoto, Ride, RideTrack, Athlete
 
-from freezing.web import app, config
+from freezing.web import config
 from freezing.web.autolog import log
 from freezing.web.serialize import RidePhotoSchema
-from freezing.web.utils import auth, dates
+from freezing.web.utils import auth
 from freezing.web.utils.wktutils import parse_linestring
 
 blueprint = Blueprint("api", __name__)

freezing/web/views/chartdata.py

@@ -3,12 +3,13 @@
 
 @author: hans
 """
+
 import json
 import copy
 from collections import defaultdict
 from datetime import datetime, timedelta
 
-from flask import current_app, request, Blueprint, jsonify
+from flask import current_app, Blueprint, jsonify
 
 from sqlalchemy import text
 from dateutil import rrule

freezing/web/views/general.py

@@ -3,7 +3,6 @@
 
 @author: hans
 """
-from datetime import timedelta
 
 from flask import (
     render_template,

freezing/web/views/people.py

@@ -1,4 +1,4 @@
-from datetime import date, timedelta
+from datetime import timedelta
 from datetime import datetime
 
 from flask import render_template, Blueprint, abort

freezing/web/views/photos.py

@@ -1,12 +1,9 @@
 import math
-from datetime import date, timedelta
-from datetime import datetime
 
-from flask import render_template, Blueprint, app, send_file, request
-from sqlalchemy import text
+from flask import render_template, Blueprint, send_file, request
 
 from freezing.model import meta
-from freezing.model.orm import Team, Athlete, RidePhoto, Ride
+from freezing.model.orm import RidePhoto, Ride
 
 from freezing.web import config
 from freezing.web.utils import insta

freezing/web/views/pointless.py

@@ -1,12 +1,10 @@
-import os
 import operator
-from datetime import date, datetime, timezone
+from datetime import datetime, timezone
 from collections import defaultdict
 import re
 
-from flask import render_template, Blueprint, abort, redirect, url_for
+from flask import render_template, Blueprint, abort
 from sqlalchemy import text
-import yaml
 
 from freezing.model import meta
 from freezing.web.config import config
@@ -280,7 +278,7 @@ def ross_hill_loop():
 @blueprint.route("/coffeeride")
 def coffeeride():
     year = datetime.now().year
-    tdata = _get_hashtag_tdata("coffeeride".format(year), "coffeeride", 2)
+    tdata = _get_hashtag_tdata("coffeeride{}".format(year), "coffeeride", 2)
     return render_template(
         "pointless/coffeeride.html", data={"tdata": tdata, "year": year}
     )