Changed from black to ruff format

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
   - id: python-check-blanket-noqa
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.1
+  rev: v0.1.3
   hooks:
   - id: ruff
 

.vscode/settings.json

@@ -8,6 +8,6 @@
       "source.fixAll.ruff": true,
       "source.organizeImports.ruff": true
     },
-    "editor.defaultFormatter": "ms-python.black-formatter"
+    "editor.defaultFormatter": "charliermarsh.ruff"
   }
 }

api/alembic.ini

@@ -5,10 +5,10 @@ output_encoding = utf-8
 version_path_separator = os
 
 [post_write_hooks]
-hooks = black
-black.type = console_scripts
-black.entrypoint = black
-black.options = -l 120 REVISION_SCRIPT_FILENAME
+hooks = ruff
+ruff.type = console_scripts
+ruff.entrypoint = ruff format
+ruff.options = -l 120 REVISION_SCRIPT_FILENAME
 
 [loggers]
 keys = root,sqlalchemy,alembic

api/app/routers/deep_rock_galactic/router.py

@@ -55,11 +55,7 @@ async def remove_build(
     session: Annotated[AsyncSession, Depends(get_db_session)],
     id: int,
 ) -> DeepRockGalacticBuildModel:
-    stmt = (
-        delete(DeepRockGalacticBuildModel)
-        .where(DeepRockGalacticBuildModel.id == id)
-        .returning()
-    )
+    stmt = delete(DeepRockGalacticBuildModel).where(DeepRockGalacticBuildModel.id == id).returning()
 
     items = await session.execute(stmt)
 

api/pyproject.toml

@@ -24,18 +24,15 @@ dependencies = [
     "pillow>=10.0.1",
     "croniter>=2.0.0",
     "matplotlib>=3.8.0",
-    "docker>=6.1.3",
     "prometheus-client>=0.17.1",
     "prometheus-fastapi-instrumentator>=6.1.0",
 ]
 
 [tool]
 [tool.pdm]
 [tool.pdm.dev-dependencies]
-lint = ["ruff>=0.0.285"]
-format = ["black>=23.7.0"]
+lint-format = ["ruff>=0.1.3"]
 precommit = ["pre-commit>=3.3.3"]
-check = ["mypy>=1.6.0"]
 test = [
     "pytest>=7.4.0",
     "anyio>=3.7.1",
@@ -47,11 +44,11 @@ test = [
 [tool.pdm.scripts]
 start = "python3 -m app"
 lint = "pre-commit run --all-files"
+fmt = "ruff format ."
 precommit = "pre-commit install"
 migrate = "alembic revision --autogenerate -m"
 upgrade = "alembic upgrade head"
 test = "pytest"
-check = "mypy"
 
 [build-system]
 requires = ["pdm-pep517>=1.0.0"]

pyproject.toml

@@ -6,12 +6,12 @@ requires-python = ">=3.11"
 dev = [
     "-e file:///${PROJECT_ROOT}/xythrion",
     "-e file:///${PROJECT_ROOT}/api",
-    "ruff>=0.0.285",
+    "ruff>=0.1.3",
     "pre-commit>=3.3.3",
-    "black>=23.7.0",
 ]
 
 [tool.pdm.scripts]
 lint = "pre-commit run --all-files"
+fmt = "ruff format ."
 precommit = "pre-commit install"
 test = "pytest"

xythrion/bot/extensions/games/minecraft/distances.py

@@ -22,7 +22,10 @@ async def mc(self, ctx: Context) -> None:
 
     @mc.command()
     async def distance(
-        self, ctx: Context, start: convert_3d_tuples, end: convert_3d_tuples,
+        self,
+        ctx: Context,
+        start: convert_3d_tuples,
+        end: convert_3d_tuples,
     ) -> None:
         (x0, y0, z0), (x1, y1, z1) = start, end
 

xythrion/bot/extensions/image_generation/gradient_images.py

@@ -53,7 +53,10 @@ async def gradient(
 
         buffer = await asyncio.to_thread(
             lambda: self.generate_gradient_image(
-                start, end, (size_h, size_v), gradient_direction,
+                start,
+                end,
+                (size_h, size_v),
+                gradient_direction,
             ),
         )
 

xythrion/bot/extensions/info/links.py

@@ -24,7 +24,8 @@ async def info(self, ctx: Context) -> None:
         """Information about bot origin."""
         embed = Embed(
             description=markdown_link(
-                desc="Xythrion Github Repository", link=GITHUB_URL,
+                desc="Xythrion Github Repository",
+                link=GITHUB_URL,
             ),
         )
 

xythrion/bot/extensions/third_party/cve.py

@@ -10,6 +10,7 @@
 
 # TODO: Pydantic models
 
+
 class CVE(Cog):
     """CVE information."""
 
@@ -18,7 +19,10 @@ def __init__(self, bot: Xythrion):
 
     @staticmethod
     def cve_embed_builder(
-        title: str, description: str, url: str, published: str,
+        title: str,
+        description: str,
+        url: str,
+        published: str,
     ) -> Embed:
         embed = Embed(
             title=title,

xythrion/bot/extensions/third_party/mars_weather.py

@@ -33,10 +33,7 @@ async def weather(self, ctx: Context) -> None:
 
         try:
             first_sol_checked = j["validity_checks"]["sols_checked"][0]
-            valid = any(
-                j["validity_checks"][first_sol_checked][x]["valid"]
-                for x in DATA_SECTIONS
-            )
+            valid = any(j["validity_checks"][first_sol_checked][x]["valid"] for x in DATA_SECTIONS)
 
             if not valid:
                 err = True

xythrion/bot/utils/gradients.py

@@ -3,7 +3,11 @@
 
 # https://github.com/nkmk/python-snippets/blob/master/notebook/numpy_generate_gradient_image.py
 def gradient2(
-    start: int, stop: int, width: int, height: int, is_horizontal: bool,
+    start: int,
+    stop: int,
+    width: int,
+    height: int,
+    is_horizontal: bool,
 ) -> np.array:
     if is_horizontal:
         return np.tile(np.linspace(start, stop, width), (height, 1))