Remove black and use ruff formatter (#1106)

michplunkett · web-flow · commit 942edd05ad8d · 2024-06-26T22:16:56.000-05:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -77,22 +77,18 @@ repos:
             - --quiet
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.7
+    rev: v0.4.10
     hooks:
       - id: ruff
-        types_or: [python, pyi, jupyter]
+        types_or: [python,pyi]
         args:
           - --fix
           - --select=B,C,E,F,W
           - --ignore=C901,E203,E402,E501,W391,E261
-
-  - repo: https://github.com/psf/black
-    rev: 23.7.0
-    hooks:
-        - id: black
-          args:
-            - --safe
-            - "--target-version=py311"
+      - id: ruff-format
+        types_or: [python,pyi]
+        args:
+          - --target-version=py311
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: 'v1.4.1'
diff --git a/OpenOversight/app/filters.py b/OpenOversight/app/filters.py
@@ -1,4 +1,5 @@
 """Contains all templates filters."""
+
 from datetime import datetime
 from zoneinfo import ZoneInfo
 
diff --git a/OpenOversight/app/models/database_imports.py b/OpenOversight/app/models/database_imports.py
@@ -252,7 +252,7 @@ def update_link_from_dict(data: Dict[str, Any], link: Link) -> Link:
 
 
 def get_or_create_license_plate_from_dict(
-    data: Dict[str, Any]
+    data: Dict[str, Any],
 ) -> Tuple[LicensePlate, bool]:
     number = data["number"]
     state = parse_str(data.get("state"), None)
@@ -266,7 +266,7 @@ def get_or_create_license_plate_from_dict(
 
 
 def get_or_create_location_from_dict(
-    data: Dict[str, Any]
+    data: Dict[str, Any],
 ) -> Tuple[Optional[Location], bool]:
     street_name = parse_str(data.get("street_name"), None)
     cross_street1 = parse_str(data.get("cross_street1"), None)
diff --git a/OpenOversight/app/utils/choices.py b/OpenOversight/app/utils/choices.py
@@ -1,4 +1,5 @@
 """Contains choice lists of (value, label) tuples for form Select fields."""
+
 from us import states
 
 
diff --git a/OpenOversight/migrations/versions/2017-12-10-0512_114919b27a9f_initial_migration.py b/OpenOversight/migrations/versions/2017-12-10-0512_114919b27a9f_initial_migration.py
@@ -5,6 +5,7 @@
 Create Date: 2017-12-10 05:20:45.748342
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2017-12-23-1812_42233d18ac7b_change_type_of_star_no_to_string.py b/OpenOversight/migrations/versions/2017-12-23-1812_42233d18ac7b_change_type_of_star_no_to_string.py
@@ -5,6 +5,7 @@
 Create Date: 2017-12-23 18:03:07.304611
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-04-12-1504_af933dc1ef93_add_preferred_department_column.py b/OpenOversight/migrations/versions/2018-04-12-1504_af933dc1ef93_add_preferred_department_column.py
@@ -5,6 +5,7 @@
 Create Date: 2018-04-12 15:41:33.490603
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-04-30-1504_e14a1aa4b58f_add_area_coordinator_columns.py b/OpenOversight/migrations/versions/2018-04-30-1504_e14a1aa4b58f_add_area_coordinator_columns.py
@@ -5,6 +5,7 @@
 Create Date: 2018-04-30 15:48:51.968189
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-05-03-1505_0acbb0f0b1ef_change_datetime_to_date_officer_details.py b/OpenOversight/migrations/versions/2018-05-03-1505_0acbb0f0b1ef_change_datetime_to_date_officer_details.py
@@ -5,6 +5,7 @@
 Create Date: 2018-05-03 15:00:36.849627
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import postgresql
diff --git a/OpenOversight/migrations/versions/2018-05-04-2105_6065d7cdcbf8_add_officers_to_incidents.py b/OpenOversight/migrations/versions/2018-05-04-2105_6065d7cdcbf8_add_officers_to_incidents.py
@@ -5,6 +5,7 @@
 Create Date: 2018-05-04 21:05:42.060165
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-05-04-2105_d86feb8fa5d1_add_incidents_table.py b/OpenOversight/migrations/versions/2018-05-04-2105_d86feb8fa5d1_add_incidents_table.py
@@ -5,6 +5,7 @@
 Create Date: 2018-05-04 21:03:12.925484
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-05-10-2005_ca95c047bf42_add_department_column_to_incidents.py b/OpenOversight/migrations/versions/2018-05-10-2005_ca95c047bf42_add_department_column_to_incidents.py
@@ -5,6 +5,7 @@
 Create Date: 2018-05-10 20:02:19.006081
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-05-15-1705_f4a41e328a06_add_columns_to_incidents_and_links.py b/OpenOversight/migrations/versions/2018-05-15-1705_f4a41e328a06_add_columns_to_incidents_and_links.py
@@ -5,6 +5,7 @@
 Create Date: 2018-05-15 17:03:06.270691
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-05-15-1905_bd0398fe4aab_rename_user_id_to_creator_id_in_incident.py b/OpenOversight/migrations/versions/2018-05-15-1905_bd0398fe4aab_rename_user_id_to_creator_id_in_incident.py
@@ -5,6 +5,7 @@
 Create Date: 2018-05-15 19:56:14.199692
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-06-04-1906_59e9993c169c_change_faces_to_thumbnails.py b/OpenOversight/migrations/versions/2018-06-04-1906_59e9993c169c_change_faces_to_thumbnails.py
@@ -5,6 +5,7 @@
 Create Date: 2018-06-04 19:04:23.524079
 
 """
+
 import os
 import sys
 
diff --git a/OpenOversight/migrations/versions/2018-06-06-1906_2040f0c804b0_create_notes_table.py b/OpenOversight/migrations/versions/2018-06-06-1906_2040f0c804b0_create_notes_table.py
@@ -5,6 +5,7 @@
 Create Date: 2018-06-06 19:34:16.439093
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-06-07-1506_4a490771dda1_add_original_image_fk.py b/OpenOversight/migrations/versions/2018-06-07-1506_4a490771dda1_add_original_image_fk.py
@@ -5,6 +5,7 @@
 Create Date: 2018-06-07 15:32:25.524117
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-06-07-1806_8ce7926aa132_add_explicit_ondelete_for_notes.py b/OpenOversight/migrations/versions/2018-06-07-1806_8ce7926aa132_add_explicit_ondelete_for_notes.py
@@ -5,6 +5,7 @@
 Create Date: 2018-06-07 18:53:47.656557
 
 """
+
 from alembic import op
 
 
diff --git a/OpenOversight/migrations/versions/2018-06-07-1806_cfc5f3fd5efe_rename_user_id_to_creator_id_in_notes.py b/OpenOversight/migrations/versions/2018-06-07-1806_cfc5f3fd5efe_rename_user_id_to_creator_id_in_notes.py
@@ -5,6 +5,7 @@
 Create Date: 2018-06-07 18:52:31.059396
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-07-26-1807_7bb53dee8ac9_add_suffix_column_to_officers.py b/OpenOversight/migrations/versions/2018-07-26-1807_7bb53dee8ac9_add_suffix_column_to_officers.py
@@ -5,6 +5,7 @@
 Create Date: 2018-07-26 18:36:10.061968
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-08-11-2008_0ed957db0058_add_description_to_officers.py b/OpenOversight/migrations/versions/2018-08-11-2008_0ed957db0058_add_description_to_officers.py
@@ -5,6 +5,7 @@
 Create Date: 2018-08-11 20:31:02.265231
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2018-08-13-1308_9e2827dae28c_add_cascading_foreign_key_constraint_to_.py b/OpenOversight/migrations/versions/2018-08-13-1308_9e2827dae28c_add_cascading_foreign_key_constraint_to_.py
@@ -5,6 +5,7 @@
 Create Date: 2018-08-13 13:18:15.381300
 
 """
+
 from alembic import op
 
 
diff --git a/OpenOversight/migrations/versions/2018-08-18-1308_2c27bfebe66e_add_unique_internal_identifier_to_.py b/OpenOversight/migrations/versions/2018-08-18-1308_2c27bfebe66e_add_unique_internal_identifier_to_.py
@@ -5,6 +5,7 @@
 Create Date: 2018-08-18 13:36:00.987327
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2019-01-07-2101_e2c2efde8b55_face_model_fix.py b/OpenOversight/migrations/versions/2019-01-07-2101_e2c2efde8b55_face_model_fix.py
@@ -5,6 +5,7 @@
 Create Date: 2019-01-07 21:57:48.495757
 
 """
+
 from alembic import op
 
 
diff --git a/OpenOversight/migrations/versions/2019-01-24-1501_5c5b80cab45e_add_approved.py b/OpenOversight/migrations/versions/2019-01-24-1501_5c5b80cab45e_add_approved.py
@@ -5,6 +5,7 @@
 Create Date: 2019-01-24 15:54:08.123125
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2019-01-25-1501_770ed51b4e16_add_salaries_table.py b/OpenOversight/migrations/versions/2019-01-25-1501_770ed51b4e16_add_salaries_table.py
@@ -5,6 +5,7 @@
 Create Date: 2019-01-25 15:47:13.812837
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2019-02-03-0502_2a9064a2507c_remove_dots_middle_initial.py b/OpenOversight/migrations/versions/2019-02-03-0502_2a9064a2507c_remove_dots_middle_initial.py
@@ -5,6 +5,7 @@
 Create Date: 2019-02-03 05:33:05.296642
 
 """
+
 import os
 import sys
 
diff --git a/OpenOversight/migrations/versions/2019-03-15-2203_86eb228e4bc0_refactor_links.py b/OpenOversight/migrations/versions/2019-03-15-2203_86eb228e4bc0_refactor_links.py
@@ -5,6 +5,7 @@
 Create Date: 2019-03-15 22:40:10.473917
 
 """
+
 from alembic import op
 
 
diff --git a/OpenOversight/migrations/versions/2019-04-17-1804_8ce3de7679c2_add_unique_internal_identifier_label.py b/OpenOversight/migrations/versions/2019-04-17-1804_8ce3de7679c2_add_unique_internal_identifier_label.py
@@ -5,6 +5,7 @@
 Create Date: 2019-04-17 18:26:35.733783
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2019-04-20-1704_3015d1dd9eb4_add_jobs_table.py b/OpenOversight/migrations/versions/2019-04-20-1704_3015d1dd9eb4_add_jobs_table.py
@@ -5,6 +5,7 @@
 Create Date: 2019-04-20 17:54:41.661851
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2019-04-24-1904_c1fc26073f85_rank_rename_po_police_officer.py b/OpenOversight/migrations/versions/2019-04-24-1904_c1fc26073f85_rank_rename_po_police_officer.py
@@ -5,6 +5,7 @@
 Create Date: 2019-04-24 19:55:46.168086
 
 """
+
 from alembic import op
 
 
diff --git a/OpenOversight/migrations/versions/2019-05-04-0505_6045f42587ec_split_apart_date_and_time_in_incidents.py b/OpenOversight/migrations/versions/2019-05-04-0505_6045f42587ec_split_apart_date_and_time_in_incidents.py
@@ -5,6 +5,7 @@
 Create Date: 2019-05-04 05:28:06.869101
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import postgresql
diff --git a/OpenOversight/migrations/versions/2020-04-24-0104_562bd5f1bc1f_add_order_to_jobs.py b/OpenOversight/migrations/versions/2020-04-24-0104_562bd5f1bc1f_add_order_to_jobs.py
@@ -5,6 +5,7 @@
 Create Date: 2020-04-24 01:58:05.146902
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.sql import column, table
diff --git a/OpenOversight/migrations/versions/2020-07-13-0207_cd39b33b5360_constrain_officer_gender_options.py b/OpenOversight/migrations/versions/2020-07-13-0207_cd39b33b5360_constrain_officer_gender_options.py
@@ -5,6 +5,7 @@
 Create Date: 2020-07-13 02:45:07.533549
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2020-07-31-1407_79a14685454f_add_featured_flag_to_faces_table.py b/OpenOversight/migrations/versions/2020-07-31-1407_79a14685454f_add_featured_flag_to_faces_table.py
@@ -5,6 +5,7 @@
 Create Date: 2020-07-31 14:03:59.871182
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2022-01-05-0601_93fc3e074dcc_remove_link_length_cap.py b/OpenOversight/migrations/versions/2022-01-05-0601_93fc3e074dcc_remove_link_length_cap.py
@@ -5,6 +5,7 @@
 Create Date: 2022-01-05 06:50:40.070530
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2023-07-18-1717_9ce70d7ebd56_rename_star_date.py b/OpenOversight/migrations/versions/2023-07-18-1717_9ce70d7ebd56_rename_star_date.py
@@ -5,6 +5,7 @@
 Create Date: 2023-07-18 17:17:02.018209
 
 """
+
 from alembic import op
 
 
diff --git a/OpenOversight/migrations/versions/2023-07-18-1921_eb0266dc8588_rename_descrip_to_description.py b/OpenOversight/migrations/versions/2023-07-18-1921_eb0266dc8588_rename_descrip_to_description.py
@@ -5,6 +5,7 @@
 Create Date: 2023-07-18 19:21:43.632936
 
 """
+
 from alembic import op
 
 
diff --git a/OpenOversight/migrations/versions/2023-07-18-2027_07ace5f956ca_standardize_datetime_field_names.py b/OpenOversight/migrations/versions/2023-07-18-2027_07ace5f956ca_standardize_datetime_field_names.py
@@ -5,6 +5,7 @@
 Create Date: 2023-07-18 20:27:19.891054
 
 """
+
 from alembic import op
 
 
diff --git a/OpenOversight/migrations/versions/2023-07-19-1638_1931b987ce0d_convert_timestamp_to_timestamptz.py b/OpenOversight/migrations/versions/2023-07-19-1638_1931b987ce0d_convert_timestamp_to_timestamptz.py
@@ -5,6 +5,7 @@
 Create Date: 2023-07-19 16:38:49.233825
 
 """
+
 import os
 
 import sqlalchemy as sa
diff --git a/OpenOversight/migrations/versions/2023-07-24-1619_52d3f6a21dd9_add__uuid_column_to_users.py b/OpenOversight/migrations/versions/2023-07-24-1619_52d3f6a21dd9_add__uuid_column_to_users.py
@@ -5,6 +5,7 @@
 Create Date: 2023-07-24 16:19:01.375427
 
 """
+
 import uuid
 
 import sqlalchemy as sa
diff --git a/OpenOversight/migrations/versions/2023-07-26-1551_18f43ac4622f_add_state_column_to_departments.py b/OpenOversight/migrations/versions/2023-07-26-1551_18f43ac4622f_add_state_column_to_departments.py
@@ -5,6 +5,7 @@
 Create Date: 2023-07-26 15:51:05.329701
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2023-08-01-1905_b38c133bed3c_add_created_by_and_created_at_columns.py b/OpenOversight/migrations/versions/2023-08-01-1905_b38c133bed3c_add_created_by_and_created_at_columns.py
@@ -5,6 +5,7 @@
 Create Date: 2023-08-01 19:05:34.745077
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/migrations/versions/2023-08-21-0300_a35aa1a114fa_add_create_and_last_update_columns.py b/OpenOversight/migrations/versions/2023-08-21-0300_a35aa1a114fa_add_create_and_last_update_columns.py
@@ -5,6 +5,7 @@
 Create Date: 2023-08-21 03:00:57.468190
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import postgresql
diff --git a/OpenOversight/migrations/versions/2024-06-05-0203_939ea0f2b26d_.py b/OpenOversight/migrations/versions/2024-06-05-0203_939ea0f2b26d_.py
@@ -5,6 +5,7 @@
 Create Date: 2024-06-05 02:03:29.168771
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 
diff --git a/OpenOversight/tests/routes/test_auth.py b/OpenOversight/tests/routes/test_auth.py
diff --git a/tasks.py b/tasks.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Contains all templates filters."""`
	`2`	`+`
`2`	`3`	`from datetime import datetime`
`3`	`4`	`from zoneinfo import ZoneInfo`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Contains choice lists of (value, label) tuples for form Select fields."""`
	`2`	`+`
`2`	`3`	`from us import states`
`3`	`4`
`4`	`5`