Update pre-commit config and formatting

.config/pre-commit-config.yaml

@@ -2,21 +2,20 @@ default_language_version:
     python: python3.11
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-ast
-  - repo: https://github.com/psf/black
-    rev: 23.9.1
-    hooks:
-      - id: black
-        args: [--config, .config/black.toml]
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.292
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.14
     hooks:
+      # Run the linter.
       - id: ruff
-        args: [--config, .config/ruff.toml, --fix, --exit-non-zero-on-fix]
+        args: [--config, .config/ruff.toml, --fix]
+      # Run the formatter.
+      - id: ruff-format
+        args: [--config, .config/ruff.toml]
   - repo: https://github.com/jazzband/pip-tools
     rev: 7.3.0
     hooks:

pyproject.toml

@@ -87,13 +87,10 @@ python = ["3.11"]
 
 [tool.hatch.envs.lint]
 detached = true
-dependencies = [
-  "black",
-  "ruff",
-]
+dependencies = ["ruff"]
 
 [tool.hatch.envs.lint.scripts]
 style = [
-  "ruff --config .config/ruff.toml {args:.}",
-  "black --config .config/black.toml --check --diff {args:.}",
+  "ruff check --config .config/ruff.toml --diff {args:.}",
+  "ruff format --config .config/ruff.toml --diff {args:.}",
 ]

src/hapi_schema/db_admin1.py

@@ -1,4 +1,5 @@
 """Admin1 table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import (

src/hapi_schema/db_admin2.py

@@ -1,4 +1,5 @@
 """Admin2 table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import (

src/hapi_schema/db_food_security.py

@@ -1,4 +1,5 @@
 """Population table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import (
@@ -79,7 +80,7 @@ class DBFoodSecurity(Base):
         DBAdmin1.is_unspecified.label("admin1_is_unspecified"),
         DBAdmin2.code.label("admin2_code"),
         DBAdmin2.name.label("admin2_name"),
-        DBAdmin2.is_unspecified.label("admin2_is_unspecified")
+        DBAdmin2.is_unspecified.label("admin2_is_unspecified"),
     ).select_from(
         # Join pop to admin2 to admin1 to loc
         DBFoodSecurity.__table__.join(

src/hapi_schema/db_humanitarian_needs.py

@@ -1,4 +1,5 @@
 """HumanitarianNeeds table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import (

src/hapi_schema/db_location.py

@@ -1,4 +1,5 @@
 """Location table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import DateTime, Integer, String, select, text

src/hapi_schema/db_national_risk.py

@@ -1,4 +1,5 @@
 """NationalRisk table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import (

src/hapi_schema/db_operational_presence.py

@@ -1,4 +1,5 @@
 """OperationalPresence table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import (
@@ -79,7 +80,7 @@ class DBOperationalPresence(Base):
         DBOrg.name.label("org_name"),
         DBOrg.org_type_code.label("org_type_code"),
         DBOrgType.description.label("org_type_description"),
-        DBSector.name.label("sector_name")
+        DBSector.name.label("sector_name"),
     ).select_from(
         # Join op to admin2 to admin1 to loc
         DBOperationalPresence.__table__.join(

src/hapi_schema/db_org.py

@@ -1,4 +1,5 @@
 """Org table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import (

src/hapi_schema/db_population.py

@@ -1,4 +1,5 @@
 """Population table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import (

src/hapi_schema/db_sector.py

@@ -1,4 +1,5 @@
 """Sector table and view."""
+
 from datetime import datetime
 
 from sqlalchemy import DateTime, String, select, text

tests/test_org_type_view.py

@@ -5,7 +5,7 @@
 
 def test_org_type_view(run_view_test):
     """Check that org type has all fields."""
-    dict(code="433", description="Donor"),
+    (dict(code="433", description="Donor"),)
     view_org_type = build_view(view_params_org_type.__dict__)
     run_view_test(
         view=view_org_type,