Merge pull request #162 from opensafely/iaindillingham/format

Placate Black/Ruff
opensafely · Aug 20, 2024 · b35f901 · b35f901
2 parents 501d79f + ac76879
commit b35f901
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/analysis/report.ipynb b/analysis/report.ipynb
@@ -49,7 +49,9 @@
    "source": [
     "log = {\n",
     "    d[\"event\"]: d\n",
-    "    for d in (json.loads(l) for l in (OUTPUT_DIR / \"log.json\").read_text().splitlines())\n",
+    "    for d in (\n",
+    "        json.loads(line) for line in (OUTPUT_DIR / \"log.json\").read_text().splitlines()\n",
+    "    )\n",
     "}"
    ]
   },

diff --git a/justfile b/justfile
@@ -118,7 +118,7 @@ check: black ruff sqlfluff
 # fix formatting and import sort ordering
 fix: devenv
     $BIN/black .
-    $BIN/ruff --fix .
+    $BIN/ruff format .
     $BIN/sqlfluff fix .
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -32,4 +32,4 @@ skip_glob = [".direnv", "venv", ".venv"]
 
 [tool.sqlfluff.core]
 dialect = "tsql"
-exclude_rules = ["structure.column_order", "references.keywords"]
+exclude_rules = ["structure.column_order", "references.keywords", "capitalisation.identifiers"]