chore: squash black & isort into ruff (#647)

This project uses `ruff`, `black` and `isort`. However, ruff can handle
all the logic for everything. And so this PR squashes them all into one
thing.

With this change, I also update the target python style version. The
only meaningful change there is adding strict to zip. Let me know if you
want these zip functions to be strict or not.

One note is that the bot can also be updated to format with ruff instead
of black. But that is a larger feature change and not in the scope of
this PR.

---------

Co-authored-by: arielle <me@arielle.codes>

Author: CoderJoshDK

.pre-commit-config.yaml

@@ -28,19 +28,9 @@ repos:
     hooks:
       - id: uv-lock
 
-  - repo: https://github.com/PyCQA/isort
-    rev: 6.1.0
-    hooks:
-      - id: isort
-
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
-    hooks:
-      - id: black
-        language_version: python3
-
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     rev: v0.13.3
     hooks:
       - id: ruff-check
         args: [--fix]
+      - id: ruff-format

alembic.ini

@@ -57,11 +57,11 @@ version_path_separator = os  # Use os.pathsep. Default configuration used for ne
 # on newly generated revision scripts.  See the documentation for further
 # detail and examples
 
-# format using "black" - use the console_scripts runner, against the "black" entrypoint
-hooks = black
-black.type = console_scripts
-black.entrypoint = black
-black.options = -l 100 REVISION_SCRIPT_FILENAME
+# format using "prek"
+hooks = pre_commit
+pre_commit.type = console_scripts
+pre_commit.entrypoint = prek
+pre_commit.options = run --files REVISION_SCRIPT_FILENAME
 
 # Logging configuration
 [loggers]

monty/exts/core/bot_features.py

@@ -184,7 +184,9 @@ async def show_feature(
         colour = (
             disnake.Colour.green()
             if feature.enabled is True
-            else disnake.Colour.greyple() if feature.enabled is None else disnake.Colour.red()
+            else disnake.Colour.greyple()
+            if feature.enabled is None
+            else disnake.Colour.red()
         )
         components: list = [
             disnake.ui.Container(

monty/exts/filters/token_remover.py

@@ -111,7 +111,7 @@ async def on_message(self, msg: disnake.Message) -> None:
         if found_tokens:
             # now check if the token is valid
             ids = await self.check_valid(*found_tokens)
-            for token, application_id in zip(found_tokens, ids):
+            for token, application_id in zip(found_tokens, ids, strict=False):
                 if application_id:
                     token.application_id = application_id
                 else:

monty/exts/info/docs/_batch_parser.py

@@ -72,7 +72,6 @@ def __eq__(self, other: "Union[QueueItem, _cog.DocItem]") -> bool:
 if TYPE_CHECKING:
 
     class Deque(collections.deque[QueueItem]):
-
         def index(self, value: Union[QueueItem, _cog.DocItem], start: int = 0, stop: Optional[int] = None) -> int: ...
 
 else:

monty/exts/info/docs/_redis_cache.py

@@ -49,9 +49,7 @@ async def set(self, item: "DocItem", value: str) -> None:
 
     async def get(self, item: "DocItem", default: Any = None) -> Optional[str]:
         """Return the Markdown content of the symbol `item` if it exists."""
-        res = await self._redis.hget(
-            f"{self.namespace}:{item_key(item)}", item.symbol_id
-        )  # pyright: ignore[reportGeneralTypeIssues]
+        res = await self._redis.hget(f"{self.namespace}:{item_key(item)}", item.symbol_id)  # pyright: ignore[reportGeneralTypeIssues]
         if res:
             return res.decode()
         return default

monty/exts/python/pypi.py

@@ -240,9 +240,7 @@ async def make_pypi_components(
                 # and parse the html to get the rendered description
                 # this means that we don't have to parse the rst or markdown or whatever is the
                 # project's description content type
-                description = await self.fetch_description(
-                    package, description, info["description_content_type"] or ""
-                )  # pyright: ignore[reportCallIssue]
+                description = await self.fetch_description(package, description, info["description_content_type"] or "")  # pyright: ignore[reportCallIssue]
                 if description:
                     components[0].children.append(disnake.ui.TextDisplay(description))
 

monty/exts/utils/misc.py

@@ -71,7 +71,7 @@ def get_info(char: str) -> Tuple[str, str]:
             info = f"`{u_code.ljust(10)}`: {name} - {disnake.utils.escape_markdown(char)}"
             return (info, u_code)
 
-        (char_list, raw_list) = zip(*(get_info(c) for c in characters))
+        (char_list, raw_list) = zip(*(get_info(c) for c in characters), strict=False)
         embed = disnake.Embed().set_author(name="Character Info")
 
         if len(characters) > 1:

pyproject.toml

@@ -54,8 +54,6 @@ devlibs = [
     "python-dotenv<2.0.0,>=1.1.0",
 ]
 tools = [
-    "black<26.0.0,>=25.9.0",
-    "isort==6.1.0",
     "poethepoet>=0.37.0",
     "prek>=0.2.1,<0.3",
     "ruff==0.13.3",
@@ -86,37 +84,17 @@ mdformat = [
     "mdformat-frontmatter<3.0.0,>=2.0.8",
 ]
 
-[tool.black]
-line-length = 120
-target-version = ['py38']
-include = '\.pyi?$'
-
-[tool.isort]
-profile = "black"
-atomic = true
-ensure_newline_before_comments = true
-force_grid_wrap = 0
-include_trailing_comma = true
-line_length = 120
-lines_after_imports = 2
-multi_line_output = 3
-use_parentheses = true
-known_first_party = ["monty"]
-
 [tool.ruff]
 line-length = 120
-target-version = "py38"
-
-[tool.ruff.lint.isort]
-known-first-party = ["monty"]
-
+target-version = "py310"
 
 [tool.ruff.lint]
 select = [
     "E", # pycodestyle
     "F", # pyflakes
     "W", # pycodestyle
     "S", # bandit
+    "I", # isort
     # "RUF", # ruff specific exceptions
     "ANN",  # flake8-annotations
     "B",    # flake8-bugbear
@@ -176,6 +154,10 @@ ignore = [
     "S311", # pseduo-random generators, random is used everywhere for random choices.
 ]
 
+[tool.ruff.lint.isort]
+lines-after-imports = 2
+known-first-party = ["monty"]
+
 [tool.ruff.lint.per-file-ignores]
 "monty/alembic/*" = ["D"]
 "_global_source_snekcode.py" = ["T201"]