chore: Use ruff and fix lints

Justfile

@@ -19,23 +19,12 @@ test:
     poetry run pytest
 
 lint:
-    poetry run black --check pollbot
-    poetry run isort \
-        --skip __init__.py \
-        --check-only pollbot
-    poetry run flake8 pollbot
+    poetry run ruff check ./pollbot --show-source
+    poetry run ruff format ./pollbot --diff
 
 format:
-    # remove unused imports
-    poetry run autoflake \
-        --remove-all-unused-imports \
-        --recursive \
-        --exclude=__init__.py,.venv \
-        --in-place pollbot
-    poetry run black pollbot
-    poetry run isort pollbot \
-        --skip __init__.py
-
+    poetry run ruff check --fix ./pollbot
+    poetry run ruff format ./pollbot
 
 # Watch for something
 # E.g. `just watch lint` or `just watch test`

pollbot/display/misc.py

@@ -1,6 +1,4 @@
 """Display helper for misc stuff."""
-from typing import Tuple, Union
-
 from sqlalchemy.orm.scoping import scoped_session
 from telegram.inline.inlinekeyboardmarkup import InlineKeyboardMarkup
 
@@ -13,7 +11,7 @@
 
 def get_help_text_and_keyboard(
     user: User, current_category: str
-) -> Tuple[str, InlineKeyboardMarkup]:
+) -> tuple[str, InlineKeyboardMarkup]:
     """Create the help message depending on the currently selected help category."""
     categories = [
         "creation",
@@ -32,7 +30,7 @@ def get_help_text_and_keyboard(
 
 def get_poll_list(
     session: scoped_session, user: User, offset: int, closed: bool = False
-) -> Union[Tuple[str, InlineKeyboardMarkup], Tuple[str, None]]:
+) -> tuple[str, InlineKeyboardMarkup] | tuple[str, None]:
     """Get the a list of polls for the user."""
     polls = (
         session.query(Poll)

pollbot/display/poll/compilation.py

@@ -1,5 +1,3 @@
-from typing import List, Optional, Tuple
-
 from sqlalchemy.orm.scoping import scoped_session
 from telegram.inline.inlinekeyboardmarkup import InlineKeyboardMarkup
 
@@ -16,9 +14,9 @@
 def get_poll_text_and_vote_keyboard(
     session: scoped_session,
     poll: Poll,
-    user: Optional[User] = None,
+    user: User | None = None,
     show_back: bool = False,
-) -> Tuple[str, InlineKeyboardMarkup]:
+) -> tuple[str, InlineKeyboardMarkup]:
     """Get the text and the vote keyboard."""
     text, summarize = get_poll_text_and_summarize(
         session,
@@ -38,7 +36,7 @@ def get_poll_text(session: scoped_session, poll: Poll) -> str:
 
 def get_poll_text_and_summarize(
     session: scoped_session, poll: Poll
-) -> Tuple[str, bool]:
+) -> tuple[str, bool]:
     """Get the poll text and vote keyboard."""
     summarize = poll.permanently_summarized or poll.summarize
 
@@ -70,7 +68,7 @@ def get_poll_text_and_summarize(
 
 def compile_poll_text(
     session: scoped_session, poll: Poll, summarize: bool = False
-) -> List[str]:
+) -> list[str]:
     """Create the text of the poll."""
     context = Context(session, poll)
 

pollbot/display/poll/indices.py

@@ -1,12 +1,11 @@
 import string
-from typing import List, Union
 
 from sqlalchemy.orm.collections import InstrumentedList
 
 from pollbot.models.option import Option
 
 
-def get_option_indices(options: Union[List[Option], InstrumentedList]) -> List[str]:
+def get_option_indices(options: list[Option] | InstrumentedList) -> list[str]:
     """Simple helper to dynamically create indices/letters for option displaying."""
     indices = list(string.ascii_lowercase)
     if len(options) > len(indices):

pollbot/display/poll/option.py

@@ -1,6 +1,6 @@
 """Poll text compilation for options."""
 import math
-from typing import Any, List, Union
+from typing import Any
 
 from sqlalchemy.orm.scoping import scoped_session
 from telegram.chat import Chat
@@ -18,7 +18,7 @@
 from .vote import get_doodle_vote_lines, get_vote_lines
 
 
-def next_option(tg_chat: Chat, poll: Poll, added_options: List[str]) -> None:
+def next_option(tg_chat: Chat, poll: Poll, added_options: list[str]) -> None:
     """Send the options message during the creation.
 
     This function also has a failsafe in it, that rollbacks the entire transaction,
@@ -47,7 +47,7 @@ def next_option(tg_chat: Chat, poll: Poll, added_options: List[str]) -> None:
 
 def get_option_information(
     session: scoped_session, poll: Poll, context: Context, summarize: bool
-) -> List[Union[Any, str]]:
+) -> list[Any | str]:
     """Compile all information about a poll option."""
     lines = []
     # Sort the options accordingly to the polls settings