black → ruff

strinking · Dec 26, 2023 · c8c5509 · c8c5509
1 parent 5f2f73a
commit c8c5509
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 102 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,5 +18,4 @@ jobs:
         cache: poetry
     - name: install python packages
       run: poetry install --with dev --no-interaction
-    - name: black
-      run: poetry run black --check futaba
+    - run: poetry run ruff format --check futaba
diff --git a/futaba/sql/models/filter.py b/futaba/sql/models/filter.py
@@ -260,7 +260,9 @@ def fetch_filter_immune_users(self, guild):
             self.tb_filter_immune_users.c.guild_id == guild.id
         )
         result = self.sql.execute(sel)
-        self.immune_users_cache[guild].update(user_id for user_id, in result.fetchall())
+        self.immune_users_cache[guild].update(
+            user_id for (user_id,) in result.fetchall()
+        )
         return self.immune_users_cache[guild]
 
     def get_filter_immune_users(self, guild):

diff --git a/futaba/sql/models/guilds.py b/futaba/sql/models/guilds.py
@@ -86,7 +86,7 @@ def get_guild_ids(self):
         sel = select([self.tb_guilds.c.guild_id])
         result = self.sql.execute(sel)
 
-        return (guild_id for guild_id, in result.fetchall())
+        return (guild_id for (guild_id,) in result.fetchall())
 
     @staticmethod
     def _get_guild(bot, guild_id):

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ tree-format = ">=0.1.2"
 python-jose = ">=3.2.0"
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.1.0"
+ruff = "^0.1.9"
 pylint = ">=2.5"
 
 [build-system]