From 2c9f7a9521eb2a4df33a47b0031b1734acdf4588 Mon Sep 17 00:00:00 2001
From: spwoodcock <sam.woodcock@protonmail.com>
Date: Thu, 6 Jun 2024 12:37:13 +0100
Subject: [PATCH] ci: use prettier legacy cli, remove black, update ruff config

---
 .pre-commit-config.yaml |  1 +
 pyproject.toml          | 15 +++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f3ce917..2beab00 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,6 +22,7 @@ repos:
     rev: v3.1.0
     hooks:
       - id: prettier
+        entry: env PRETTIER_LEGACY_CLI=1 prettier
         args: [--ignore-unknown, --no-error-on-unmatched-pattern, "!chart/**"]
 
   # Lint: Markdown
diff --git a/pyproject.toml b/pyproject.toml
index 7cf7257..94f5802 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -65,7 +65,6 @@ includes = ["osm_rawdata"]
 source-includes = ["LICENSE.md", "README.md"]
 [tool.pdm.dev-dependencies]
 dev = [
-    "black>=23.7.0",
     "commitizen>=3.6.0",
     "pre-commit>=3.3.3",
 ]
@@ -83,16 +82,10 @@ docs = [
     "mkdocs-exclude>=1.0.2",
 ]
 
-[tool.black]
-line-length = 132
-target-versions = ["py310", "py311"]
-
 [tool.ruff]
 fix = true
-line-length = 132
+line-length = 88
 target-version = "py310"
-select = ["I", "E", "W", "D", "B", "F", "N", "Q"]
-ignore = ["N805", "B008"]
 exclude = [
     ".git",
     ".ruff_cache",
@@ -102,10 +95,12 @@ exclude = [
     "dist",
     "osm_rawdata/__version__.py",
 ]
-[tool.ruff.pydocstyle]
+[tool.ruff.lint]
+select = ["I", "E", "W", "D", "B", "F", "N", "Q"]
+ignore = ["N805", "B008"]
+[tool.ruff.lint.pydocstyle]
 convention = "google"
 
-
 [project.scripts]
 # osm-rawdata = "osm_rawdata.cmd:main"
 importer = "osm_rawdata.importer:main"