ci: replace flake8 with ruff (#1300)

* ci: define ruff config

* refactor: run ruff autofix

* ci: add D404 & D203 to excludes

* refactor: resolve remaining ruff warnings

* ci: replace autoflake and flake8 with ruff

Author: LordOfPolls

.pre-commit-config.yaml

@@ -30,44 +30,26 @@ repos:
       name: TOML Structure
     - id: check-merge-conflict
       name: Merge Conflicts
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: 'v0.0.254'
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/psf/black
     rev: 23.1.0
     hooks:
-    - id: black
-      name: Black Formatting
-      language: python
-      types: [file, python]
-      language_version: python3.10
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
-    hooks:
-    - id: flake8
-      name: flake8 Formatting
-      language: python
-      types: [file, python]
-      args: [--ignore=E203 E301 E302 E501 E402 E704 W503 W504]
-      additional_dependencies:
-        - flake8-annotations
-        - flake8-bandit
-        - flake8-docstrings
-        - flake8-bugbear
-        - flake8-comprehensions
-        - flake8-raise
-        - flake8-deprecated
-        - flake8-print
-        - git+https://github.com/python-formate/flake8-dunder-all
-      language_version: python3.10
+      - id: black
+        name: Black Formatting
+        language: python
+        types: [ file, python ]
+        language_version: python3.10
 #  - repo: https://github.com/pycqa/isort
 #    rev: 5.11.4
 #    hooks:
 #      - id: isort
 #        name: isort Formatting
 #        language: python
 #        types: [file, python]
-  - repo: https://github.com/PyCQA/autoflake
-    rev: v2.0.0
-    hooks:
-    - id: autoflake
 ci:
   autoupdate_branch: "unstable"
   autofix_prs: true

interactions/api/events/processors/guild_events.py

@@ -40,11 +40,11 @@ async def _on_raw_guild_create(self, event: "RawGatewayEvent") -> None:
 
         guild = self.cache.place_guild_data(event.data)
 
-        self._user._guild_ids.add(to_snowflake(event.data.get("id")))  # noqa : w0212
+        self._user._guild_ids.add(to_snowflake(event.data.get("id")))
 
         self._guild_event.set()
 
-        if self.fetch_members and not guild.chunked.is_set():  # noqa
+        if self.fetch_members and not guild.chunked.is_set():
             # delays events until chunking has completed
             await guild.chunk()
 

interactions/api/gateway/gateway.py

@@ -1,4 +1,4 @@
-"""This file outlines the interaction between interactions and Discord's Gateway API."""
+"""Outlines the interaction between interactions and Discord's Gateway API."""
 import asyncio
 import sys
 import time
@@ -160,7 +160,7 @@ async def run(self) -> None:
                 self.sequence = seq
 
             if op == OPCODE.DISPATCH:
-                asyncio.create_task(self.dispatch_event(data, seq, event))
+                _ = asyncio.create_task(self.dispatch_event(data, seq, event))
                 continue
 
             # This may try to reconnect the connection so it is best to wait
@@ -215,17 +215,19 @@ async def dispatch_event(self, data, seq, event) -> None:
             case "RESUMED":
                 self.logger.info(f"Successfully resumed connection! Session_ID: {self.session_id}")
                 self.state.client.dispatch(events.Resume())
-                return
+                return None
 
             case "GUILD_MEMBERS_CHUNK":
-                asyncio.create_task(self._process_member_chunk(data.copy()))
+                _ = asyncio.create_task(self._process_member_chunk(data.copy()))
 
             case _:
                 # the above events are "special", and are handled by the gateway itself, the rest can be dispatched
                 event_name = f"raw_{event.lower()}"
                 if processor := self.state.client.processors.get(event_name):
                     try:
-                        asyncio.create_task(processor(events.RawGatewayEvent(data.copy(), override_name=event_name)))
+                        _ = asyncio.create_task(
+                            processor(events.RawGatewayEvent(data.copy(), override_name=event_name))
+                        )
                     except Exception as ex:
                         self.logger.error(f"Failed to run event processor for {event_name}: {ex}")
                 else:

interactions/api/gateway/state.py

@@ -117,9 +117,9 @@ async def _ws_connect(self) -> None:
         except WebSocketClosed as ex:
             if ex.code == 4011:
                 raise NaffException("Your bot is too large, you must use shards") from None
-            elif ex.code == 4013:
+            if ex.code == 4013:
                 raise NaffException(f"Invalid Intents have been passed: {self.intents}") from None
-            elif ex.code == 4014:
+            if ex.code == 4014:
                 raise NaffException(
                     "You have requested privileged intents that have not been enabled or approved. Check the developer dashboard"
                 ) from None

interactions/api/gateway/websocket.py

@@ -118,8 +118,7 @@ def average_latency(self) -> float:
         """Get the average latency of the connection (seconds)."""
         if self._latency:
             return sum(self._latency) / len(self._latency)
-        else:
-            return float("inf")
+        return float("inf")
 
     @property
     def latency(self) -> float:
@@ -197,7 +196,7 @@ async def receive(self, force: bool = False) -> str:
                 await self.reconnect(code=resp.data, resume=resp.data != 1000)
                 continue
 
-            elif resp.type is WSMsgType.CLOSED:
+            if resp.type is WSMsgType.CLOSED:
                 if force:
                     raise RuntimeError("Discord unexpectedly closed the underlying socket during force receive!")
 

interactions/api/http/http_client.py

@@ -76,6 +76,7 @@ def set_reset_time(self, delta: float) -> None:
         Sets the reset time to the current time + delta.
 
         To be called if a 429 is received.
+
         Args:
             delta: The time to wait before resetting the calls.
         """
@@ -373,7 +374,7 @@ async def request(
                                 )
                                 await lock.defer_unlock()  # lock this route and wait for unlock
                             continue
-                        elif lock.remaining == 0:
+                        if lock.remaining == 0:
                             # Last call available in the bucket, lock until reset
                             self.log_ratelimit(
                                 self.logger.debug,
@@ -407,12 +408,11 @@ async def _raise_exception(self, response, route, result) -> None:
 
         if response.status == 403:
             raise Forbidden(response, response_data=result, route=route)
-        elif response.status == 404:
+        if response.status == 404:
             raise NotFound(response, response_data=result, route=route)
-        elif response.status >= 500:
+        if response.status >= 500:
             raise DiscordError(response, response_data=result, route=route)
-        else:
-            raise HTTPException(response, response_data=result, route=route)
+        raise HTTPException(response, response_data=result, route=route)
 
     def log_ratelimit(self, log_func: Callable, message: str) -> None:
         """

interactions/api/http/http_requests/threads.py

@@ -198,10 +198,9 @@ async def create_thread(
                 payload=payload,
                 reason=reason,
             )
-        else:
-            payload["type"] = thread_type or ChannelType.GUILD_PUBLIC_THREAD
-            payload["invitable"] = invitable
-            return await self.request(Route("POST", f"/channels/{channel_id}/threads"), payload=payload, reason=reason)
+        payload["type"] = thread_type or ChannelType.GUILD_PUBLIC_THREAD
+        payload["invitable"] = invitable
+        return await self.request(Route("POST", f"/channels/{channel_id}/threads"), payload=payload, reason=reason)
 
     async def create_forum_thread(
         self,

interactions/api/voice/audio.py

@@ -1,6 +1,6 @@
 import audioop
 import shutil
-import subprocess  # noqa: S404
+import subprocess
 import threading
 import time
 from abc import ABC, abstractmethod
@@ -88,7 +88,7 @@ def read(self, frame_size: int) -> bytes:
         """
         Reads frame_size ms of audio from source.
 
-        returns:
+        Returns:
             bytes of audio
         """
         ...
@@ -199,9 +199,7 @@ def _create_process(self, *, block: bool = True) -> None:
         cmd[1:1] = before
         cmd.extend(after)
 
-        self.process = subprocess.Popen(  # noqa: S603
-            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.DEVNULL
-        )
+        self.process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.DEVNULL)
         self.read_ahead_task.start()
 
         if block:
@@ -246,7 +244,7 @@ def read(self, frame_size: int) -> bytes:
         """
         Reads frame_size bytes of audio from the buffer.
 
-        returns:
+        Returns:
             bytes of audio
         """
         if not self.process:
@@ -293,7 +291,7 @@ def read(self, frame_size: int) -> bytes:
         """
         Reads frame_size ms of audio from source.
 
-        returns:
+        Returns:
             bytes of audio
         """
         data = super().read(frame_size)

interactions/api/voice/voice_gateway.py

@@ -115,7 +115,7 @@ async def receive(self, force=False) -> str:
                     continue
                 raise VoiceWebSocketClosed(resp.data)
 
-            elif resp.type is WSMsgType.CLOSED:
+            if resp.type is WSMsgType.CLOSED:
                 if force:
                     raise RuntimeError("Discord unexpectedly closed the underlying socket during force receive!")
 
@@ -216,7 +216,7 @@ async def reconnect(self, *, resume: bool = False, code: int = 1012) -> None:
                     self._kill_bee_gees.set()
                     self.close()
                     self.logger.debug("Terminating VoiceGateway due to disconnection")
-                    return
+                    return None
 
                 self._voice_server_update.clear()
 

interactions/client/auto_shard_client.py

@@ -60,8 +60,7 @@ def latency(self) -> float:
         if len(self._connection_states):
             latencies = sum((g.latency for g in self._connection_states))
             return latencies / len(self._connection_states)
-        else:
-            return float("inf")
+        return float("inf")
 
     @property
     def latencies(self) -> dict[int, float]: