Hooks

Author: matthiask

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: ".yarn/|yarn.lock"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
       - id: check-builtin-literals
@@ -24,24 +24,17 @@ repos:
         language: system
         always_run: true
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.14.1
+    rev: 1.15.0
     hooks:
       - id: django-upgrade
         args: [--target-version, "4.2"]
-  - repo: https://github.com/MarcoGorelli/absolufy-imports
-    rev: v0.3.1
-    hooks:
-      - id: absolufy-imports
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.0.290"
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: "v0.1.2"
     hooks:
       - id: ruff
-  - repo: https://github.com/psf/black
-    rev: 23.9.1
-    hooks:
-      - id: black
+      - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.49.0
+    rev: v8.52.0
     hooks:
       - id: eslint
         args: [--fix]
@@ -70,10 +63,10 @@ repos:
         args: [--list-different, --no-semi]
         exclude: "^conf/|.*\\.html$|.*\\.json$"
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 1.1.0
+    rev: 1.2.0
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.14
+    rev: v0.15
     hooks:
       - id: validate-pyproject

pyproject.toml

@@ -34,6 +34,8 @@ extend-select = [
   "SLOT",
   # flake8-simplify
   "SIM",
+  # flake8-tidy-imports
+  "TID",
   # flake8-gettext
   "INT",
   # flake8-use-pathlib
@@ -81,9 +83,14 @@ max-complexity = 15
   # No boolean trap in function definitions in the fabfile
   "FBT002",
 ]
-# Allow Python files in conf/ and scripts/ without __init__
-"conf/*" = ["INP"]
-"scripts/*" = ["INP"]
+"conf/*" = [
+  # Allow Python files in conf/ without __init__
+  "INP",
+]
+"scripts/*" = [
+  # Allow Python files in scripts/ without __init__
+  "INP",
+]
 
 [tool.coverage.run]
 branch = true

webpack.library.js

@@ -51,7 +51,7 @@ module.exports = (PRODUCTION) => {
       presets: [
         [
           "@babel/preset-env",
-          { useBuiltIns: "usage", corejs: "3.25", targets: "defaults" },
+          { useBuiltIns: "usage", corejs: "3.33", targets: "defaults" },
         ],
       ],
       plugins: plugins || [],
@@ -208,6 +208,18 @@ module.exports = (PRODUCTION) => {
         ],
       })
     },
+    resolvePreactAsReact() {
+      return {
+        resolve: {
+          alias: {
+            react: "preact/compat",
+            "react-dom/test-utils": "preact/test-utils",
+            "react-dom": "preact/compat", // Must be below test-utils
+            "react/jsx-runtime": "preact/jsx-runtime",
+          },
+        },
+      }
+    },
     babelWithReactRule() {
       return babelRule({
         presets: [["@babel/preset-react", { runtime: "automatic" }]],

workbench/accounts/tasks.py

@@ -30,11 +30,14 @@ def generate_pairings(users):
 
     while randomized:
         if len(randomized) == 3:
-            yield randomized, [
-                tuple(sorted((randomized[0].id, randomized[1].id))),
-                tuple(sorted((randomized[0].id, randomized[2].id))),
-                tuple(sorted((randomized[1].id, randomized[2].id))),
-            ]
+            yield (
+                randomized,
+                [
+                    tuple(sorted((randomized[0].id, randomized[1].id))),
+                    tuple(sorted((randomized[0].id, randomized[2].id))),
+                    tuple(sorted((randomized[1].id, randomized[2].id))),
+                ],
+            )
             break
 
         else:

workbench/deals/forms.py

@@ -344,7 +344,7 @@ def __init__(self, *args, **kwargs):
         instance.status = int(kwargs["request"].GET.get("status", instance.status))
         if instance.status in {Deal.ACCEPTED, Deal.DECLINED}:
             instance.closed_on = dt.date.today()
-        elif instance.status in {Deal.OPEN}:
+        elif instance.status == Deal.OPEN:
             instance.closed_on = None
             instance.closing_type = None
             instance.closing_notice = ""

workbench/logbook/test_logbook.py

@@ -197,8 +197,9 @@ def test_log_and_create_service(self):
         )
         self.assertContains(
             response,
-            '<a href="{}#service{}">service title: service description'
-            "</a>".format(project.get_absolute_url(), entry.service.id),
+            '<a href="{}#service{}">service title: service description' "</a>".format(
+                project.get_absolute_url(), entry.service.id
+            ),
         )
 
     def test_log_and_create_service_with_flat_rate(self):

workbench/planning/reporting.py

@@ -1,6 +1,6 @@
 import datetime as dt
 from collections import defaultdict
-from itertools import islice, takewhile
+from itertools import islice, starmap, takewhile
 
 from django.db import connections
 from django.db.models import Q, Sum
@@ -371,10 +371,7 @@ def _project_record(self, project, offers):
             sorted(
                 filter(
                     None,
-                    (
-                        self._offer_record(offer, work_list)
-                        for offer, work_list in sorted(offers.items())
-                    ),
+                    starmap(self._offer_record, sorted(offers.items())),
                 ),
                 key=lambda row: (
                     row["offer"]["date_from"],
@@ -579,10 +576,7 @@ def report(self):
             "projects_offers": sorted(
                 filter(
                     None,
-                    (
-                        self._project_record(project, offers)
-                        for project, offers in self._projects_offers.items()
-                    ),
+                    starmap(self._project_record, self._projects_offers.items()),
                 ),
                 key=lambda row: (
                     row["project"]["date_from"],

workbench/projects/forms.py

@@ -451,7 +451,7 @@ def __init__(self, *args, **kwargs):
         offer = self.instance.offer
         if offer and offer.status > offer.SERVICE_GROUP:
             for field in self.fields:
-                if field not in {"allow_logging"}:
+                if field != "allow_logging":
                     self.fields[field].disabled = True
 
             if self.request.method == "GET":

workbench/projects/reporting.py

@@ -1,4 +1,5 @@
 from collections import defaultdict
+from itertools import starmap
 from types import SimpleNamespace
 
 from django.db.models import Sum
@@ -127,7 +128,7 @@ def _user(u, row):
             "url": _logbook_url(rendered_by=u.id),
         }
 
-    users = [_user(u, row) for u, row in sorted(hours.items())]
+    users = list(starmap(_user, sorted(hours.items())))
 
     return {
         "types": [external_type, *internal_types],

workbench/templatetags/workbench.py

@@ -70,7 +70,7 @@ def field_value_pairs(object, fields=None):
             or field.one_to_one
             or field.many_to_many
             or field.primary_key
-            or field.name in {"_fts"}
+            or field.name == "_fts"
             or field.name not in fields
         ):
             continue

workbench/tools/forms.py

@@ -254,7 +254,7 @@ def querystring(params=None, **kwargs):
         sorted(
             (key, value)
             for key, value in dict(params, **kwargs).items()
-            if key not in {"error"} and value
+            if key != "error" and value
         )
     )
     return "?%s" % query

workbench/tools/search.py

@@ -65,9 +65,7 @@ def fts(table, fields):
 DROP TRIGGER IF EXISTS {table}_fts_trigger ON {table};
 CREATE TRIGGER {table}_fts_trigger BEFORE INSERT OR UPDATE
   ON {table} FOR EACH ROW EXECUTE PROCEDURE {table}_fts();
-""".format(
-        table=table, fields=", ".join(f"new.{field}" for field in fields)
-    )
+""".format(table=table, fields=", ".join(f"new.{field}" for field in fields))
 
 
 def process_query(s):