Replace black with ruff format

sankichi92 · Nov 4, 2023 · 4faef3a · 4faef3a
1 parent 7d6f776
commit 4faef3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -29,11 +29,11 @@ jobs:
       - name: Install dependencies
         run: rye sync
 
-      - name: Lint with black
-        run: rye run lint:black
+      - name: Lint with ruff format
+        run: rye run lint:ruff:format
 
-      - name: Lint with ruff
-        run: rye run lint:ruff
+      - name: Lint with ruff check
+        run: rye run lint:ruff:check
 
       - name: Type check with pyright
         run: rye run lint:pyright

diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ build-backend = "hatchling.build"
 [tool.rye]
 managed = true
 dev-dependencies = [
-    "ruff>=0.0.287",
+    "ruff>=0.1.4",
     "pyright>=1.1.325",
     "types-requests>=2.31.0.2",
     "pytest>=7.4.1",
@@ -37,19 +37,18 @@ dev-dependencies = [
     "matplotlib>=3.7.2",
     "folium>=0.14.0",
     "mapclassify>=2.6.0",
-    "black[jupyter]>=23.9.0",
     "rioxarray>=0.15.0",
 ]
 
 [tool.rye.scripts]
 test = "pytest"
-lint = { chain = ["lint:black", "lint:ruff", "lint:pyright"] }
-"lint:black" = "black --check ."
-"lint:ruff" = "ruff check ."
+lint = { chain = ["lint:ruff:format", "lint:ruff:check", "lint:pyright"] }
+"lint:ruff:format" = "ruff format . --check"
+"lint:ruff:check" = "ruff check ."
 "lint:pyright" = "pyright"
-fix = { chain = ["fix:black", "fix:ruff"] }
-"fix:black" = "black ."
-"fix:ruff" = "ruff check . --fix"
+fix = { chain = ["fix:ruff:format", "fix:ruff:check"] }
+"fix:ruff:format" = "ruff format ."
+"fix:ruff:check" = "ruff check . --fix"
 doc = "mkdocs serve"
 "doc:build" = "mkdocs build"