CI fixes for Flask, black, & testing (#123)

* Upgrade black version

* Clean up using pre-commit

* Upgrade Flask and Flask-Login dependencies to fix Werkzeug missing function error

* Make browser thread daemon thread so tests actually exit

* Fix pre-commit error!

Co-authored-by: sea-kelp <66500457+sea-kelp@users.noreply.github.com>

Author: AetherUnbound

.pre-commit-config.yaml

@@ -80,8 +80,8 @@ repos:
             - --ignore=E203,E402,E501,E800,W503,W391,E261
             - --select=B,C,E,F,W,T4,B9
 
-  - repo: https://github.com/ambv/black
-    rev: 21.6b0
+  - repo: https://github.com/psf/black
+    rev: 22.3.0
     hooks:
         - id: black
           args:

OpenOversight/app/commands.py

@@ -460,7 +460,7 @@ def bulk_add_officers(filename, no_create, update_by_name, update_static_fields)
 
     # handles unicode errors that can occur when the file was made in Excel
     with open(filename, "r") as f:
-        if u"\ufeff" in f.readline():
+        if "\ufeff" in f.readline():
             encoding = "utf-8-sig"
 
     with open(filename, "r", encoding=encoding) as f:

OpenOversight/app/formfields.py

@@ -20,7 +20,7 @@ def _value(self):
             return self.data and self.data.strftime(self.format) or ""
 
     def process_formdata(self, valuelist):
-        if valuelist and valuelist != [u""]:
+        if valuelist and valuelist != [""]:
             time_str = " ".join(valuelist)
             try:
                 components = time_str.split(":")

OpenOversight/app/main/forms.py

@@ -163,7 +163,7 @@ class AssignmentForm(Form):
         query_factory=unit_choices,
         get_label="descrip",
         allow_blank=True,
-        blank_text=u"None",
+        blank_text="None",
     )
     star_date = DateField("Assignment start date", validators=[Optional()])
     resign_date = DateField(
@@ -329,7 +329,7 @@ class AddOfficerForm(Form):
         query_factory=unit_choices,
         get_label="descrip",
         allow_blank=True,
-        blank_text=u"None",
+        blank_text="None",
     )
     employment_date = DateField("Employment Date", validators=[Optional()])
     birth_year = IntegerField("Birth Year", validators=[Optional()])

OpenOversight/app/widgets.py

@@ -10,7 +10,7 @@ def __init__(self, html_tag="ul", prefix_label=True, classes="list-unstyled"):
 
     def __call__(self, field, **kwargs):
         c = kwargs.pop("classes", "") or kwargs.pop("class_", "")
-        kwargs["class"] = u"%s %s" % (self.classes, c)
+        kwargs["class"] = "%s %s" % (self.classes, c)
         kwargs.setdefault("id", field.id)
         html = ["<%s %s>" % (self.html_tag, html_params(**kwargs))]
         for subfield in field:

OpenOversight/migrations/versions/114919b27a9f_.py

@@ -45,6 +45,6 @@ def downgrade():
         ),
         sa.Column("repository_path", sa.TEXT(), autoincrement=False, nullable=True),
         sa.Column("version", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.PrimaryKeyConstraint("repository_id", name=u"migrate_version_pkey"),
+        sa.PrimaryKeyConstraint("repository_id", name="migrate_version_pkey"),
     )
     # ### end Alembic commands ###

OpenOversight/migrations/versions/4a490771dda1_add_original_image_fk.py

@@ -21,7 +21,7 @@ def upgrade():
     op.add_column(
         "faces", sa.Column("fk_face_original_image_id", sa.Integer(), nullable=True)
     )
-    op.drop_constraint(u"faces_img_id_fkey", "faces", type_="foreignkey")
+    op.drop_constraint("faces_img_id_fkey", "faces", type_="foreignkey")
     op.create_foreign_key(
         "fk_face_image_id",
         "faces",
@@ -50,7 +50,7 @@ def downgrade():
     op.drop_constraint(None, "faces", type_="foreignkey")
     op.drop_constraint("fk_face_image_id", "faces", type_="foreignkey")
     op.create_foreign_key(
-        u"faces_img_id_fkey", "faces", "raw_images", ["img_id"], ["id"]
+        "faces_img_id_fkey", "faces", "raw_images", ["img_id"], ["id"]
     )
     op.drop_column("faces", "fk_face_original_image_id")
     # ### end Alembic commands ###

OpenOversight/migrations/versions/6065d7cdcbf8_.py

@@ -33,35 +33,35 @@ def upgrade():
         sa.PrimaryKeyConstraint("incident_id", "officers_id"),
     )
     op.add_column(
-        u"incident_license_plates",
+        "incident_license_plates",
         sa.Column("license_plate_id", sa.Integer(), nullable=False),
     )
     op.drop_constraint(
-        u"incident_license_plates_link_id_fkey",
+        "incident_license_plates_link_id_fkey",
         "incident_license_plates",
         type_="foreignkey",
     )
     op.create_foreign_key(
         None, "incident_license_plates", "license_plates", ["license_plate_id"], ["id"]
     )
-    op.drop_column(u"incident_license_plates", "link_id")
+    op.drop_column("incident_license_plates", "link_id")
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.add_column(
-        u"incident_license_plates",
+        "incident_license_plates",
         sa.Column("link_id", sa.INTEGER(), autoincrement=False, nullable=False),
     )
     op.drop_constraint(None, "incident_license_plates", type_="foreignkey")
     op.create_foreign_key(
-        u"incident_license_plates_link_id_fkey",
+        "incident_license_plates_link_id_fkey",
         "incident_license_plates",
         "license_plates",
         ["link_id"],
         ["id"],
     )
-    op.drop_column(u"incident_license_plates", "license_plate_id")
+    op.drop_column("incident_license_plates", "license_plate_id")
     op.drop_table("incident_officers")
     # ### end Alembic commands ###

OpenOversight/migrations/versions/8ce7926aa132_.py

@@ -17,8 +17,8 @@
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint(u"notes_officer_id_fkey", "notes", type_="foreignkey")
-    op.drop_constraint(u"notes_creator_id_fkey", "notes", type_="foreignkey")
+    op.drop_constraint("notes_officer_id_fkey", "notes", type_="foreignkey")
+    op.drop_constraint("notes_creator_id_fkey", "notes", type_="foreignkey")
     op.create_foreign_key(
         None, "notes", "officers", ["officer_id"], ["id"], ondelete="CASCADE"
     )
@@ -33,9 +33,9 @@ def downgrade():
     op.drop_constraint(None, "notes", type_="foreignkey")
     op.drop_constraint(None, "notes", type_="foreignkey")
     op.create_foreign_key(
-        u"notes_creator_id_fkey", "notes", "users", ["creator_id"], ["id"]
+        "notes_creator_id_fkey", "notes", "users", ["creator_id"], ["id"]
     )
     op.create_foreign_key(
-        u"notes_officer_id_fkey", "notes", "officers", ["officer_id"], ["id"]
+        "notes_officer_id_fkey", "notes", "officers", ["officer_id"], ["id"]
     )
     # ### end Alembic commands ###

OpenOversight/migrations/versions/9e2827dae28c_.py

@@ -17,9 +17,7 @@
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint(
-        u"assignments_officer_id_fkey", "assignments", type_="foreignkey"
-    )
+    op.drop_constraint("assignments_officer_id_fkey", "assignments", type_="foreignkey")
     op.create_foreign_key(
         None, "assignments", "officers", ["officer_id"], ["id"], ondelete="CASCADE"
     )
@@ -30,7 +28,7 @@ def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_constraint(None, "assignments", type_="foreignkey")
     op.create_foreign_key(
-        u"assignments_officer_id_fkey",
+        "assignments_officer_id_fkey",
         "assignments",
         "officers",
         ["officer_id"],