Merge poetry into mypy

.flake8

@@ -1,3 +1,4 @@
 [flake8]
 max-line-length = 120
-ignore = C812,C813,C815,C816,D,E800,F401,F403,F405,I,Q000,RST210,RST213,RST215,RST304,S311,WPS,W503
+ignore = C812,C813,C815,C816,Q000,RST210,RST213,RST215,RST304,W503
+extend-ignore = D,E800,S311,WPS

.github/workflows/ci.yml

@@ -28,8 +28,8 @@ jobs:
           pip install poetry poethepoet
           poetry install -n --no-root
 
-      - name: Check code formatting with black
-        run: poe black --diff --check
+      - name: Check code formatting with black and isort
+        run: poe black --diff --check && poe isort --diff --check
 
 #  mypy:
 #    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository }}

__init__.py

@@ -1,7 +1 @@
-from . import translations as _
-
-from .administration import *
-from .general import *
-from .information import *
-from .integrations import *
-from .moderation import *
+from . import translations as _  # noqa

administration/__init__.py

@@ -2,3 +2,6 @@
 from .roles import RolesCog
 from .settings import SettingsCog
 from .sudo import SudoCog
+
+
+__all__ = ["PermissionsCog", "RolesCog", "SettingsCog", "SudoCog"]

administration/permissions/cog.py

@@ -3,20 +3,22 @@
 
 from discord import Embed, Role
 from discord.ext import commands
-from discord.ext.commands import guild_only, Context, Converter, BadArgument, CommandError, UserInputError
+from discord.ext.commands import BadArgument, CommandError, Context, Converter, UserInputError, guild_only
 
 from PyDrocsid.cog import Cog
-from PyDrocsid.command import reply, docs
+from PyDrocsid.command import docs, reply
 from PyDrocsid.config import Config, get_subclasses_in_enabled_packages
 from PyDrocsid.embeds import send_long_embed
-from PyDrocsid.permission import BasePermissionLevel, BasePermission
+from PyDrocsid.permission import BasePermission, BasePermissionLevel
 from PyDrocsid.settings import RoleSettings
 from PyDrocsid.translations import t
+
 from .colors import Colors
 from .permissions import PermissionsPermission
 from ...contributor import Contributor
 from ...pubsub import send_to_changelog
 
+
 tg = t.g
 t = t.permissions
 

administration/roles/cog.py

@@ -1,25 +1,27 @@
-from typing import Optional, Union, Dict, List
+from typing import Dict, List, Optional, Union
 
-from discord import Role, Embed, Member, Status, Guild, NotFound, User, Forbidden, Permissions
+from discord import Embed, Forbidden, Guild, Member, NotFound, Permissions, Role, Status, User
 from discord.ext import commands
-from discord.ext.commands import CommandError, Context, guild_only, UserInputError, Group
+from discord.ext.commands import CommandError, Context, Group, UserInputError, guild_only
 
 from PyDrocsid.cog import Cog
-from PyDrocsid.command import reply, docs, optional_permissions
+from PyDrocsid.command import docs, optional_permissions, reply
 from PyDrocsid.config import Config
 from PyDrocsid.converter import UserMemberConverter
-from PyDrocsid.database import db, select, filter_by
+from PyDrocsid.database import db, filter_by, select
 from PyDrocsid.embeds import send_long_embed
 from PyDrocsid.emojis import name_to_emoji
 from PyDrocsid.prefix import get_prefix
 from PyDrocsid.settings import RoleSettings
 from PyDrocsid.translations import t
 from PyDrocsid.util import check_role_assignable
+
 from .colors import Colors
-from .models import RoleAuth, PermaRole
+from .models import PermaRole, RoleAuth
 from .permissions import RolesPermission
 from ...contributor import Contributor
-from ...pubsub import send_to_changelog, send_alert
+from ...pubsub import send_alert, send_to_changelog
+
 
 tg = t.g
 t = t.roles

administration/roles/models.py

@@ -2,9 +2,9 @@
 
 from typing import Union
 
-from sqlalchemy import Column, BigInteger, Boolean
+from sqlalchemy import BigInteger, Boolean, Column
 
-from PyDrocsid.database import db, select, Base
+from PyDrocsid.database import Base, db, select
 
 
 class RoleAuth(Base):

administration/settings/cog.py

@@ -2,17 +2,19 @@
 
 from discord import Embed
 from discord.ext import commands
-from discord.ext.commands import guild_only, Context, CommandError
+from discord.ext.commands import CommandError, Context, guild_only
 
 from PyDrocsid.cog import Cog
-from PyDrocsid.command import reply, docs
+from PyDrocsid.command import docs, reply
 from PyDrocsid.prefix import set_prefix
 from PyDrocsid.translations import t
+
 from .colors import Colors
 from .permissions import SettingsPermission
 from ...contributor import Contributor
 from ...pubsub import send_to_changelog
 
+
 tg = t.g
 t = t.settings
 

administration/sudo/cog.py

@@ -1,8 +1,8 @@
 import sys
 
-from discord import TextChannel, Message
+from discord import Message, TextChannel
 from discord.ext import commands
-from discord.ext.commands import check, Context, CheckFailure
+from discord.ext.commands import CheckFailure, Context, check
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.config import Config
@@ -12,9 +12,11 @@
 from PyDrocsid.permission import permission_override
 from PyDrocsid.redis import redis
 from PyDrocsid.translations import t
+
 from .permissions import SudoPermission
 from ...contributor import Contributor
 
+
 tg = t.g
 t = t.sudo
 

general/__init__.py

@@ -8,3 +8,17 @@
 from .remind_me import RemindMeCog
 from .utils import UtilsCog
 from .voice_channel import VoiceChannelCog
+
+
+__all__ = [
+    "BeTheProfessionalCog",
+    "CustomCommandsCog",
+    "DiscordBotTokenDeleterCog",
+    "NewsCog",
+    "PollsCog",
+    "ReactionPinCog",
+    "ReactionRoleCog",
+    "RemindMeCog",
+    "UtilsCog",
+    "VoiceChannelCog",
+]

general/betheprofessional/cog.py

@@ -1,22 +1,24 @@
 import string
 from typing import List
 
-from discord import Role, Guild, Member, Embed
+from discord import Embed, Guild, Member, Role
 from discord.ext import commands
-from discord.ext.commands import guild_only, Context, CommandError, UserInputError
+from discord.ext.commands import CommandError, Context, UserInputError, guild_only
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.command import reply
 from PyDrocsid.database import db, select
 from PyDrocsid.embeds import send_long_embed
 from PyDrocsid.translations import t
 from PyDrocsid.util import calculate_edit_distance, check_role_assignable
+
 from .colors import Colors
 from .models import BTPRole
 from .permissions import BeTheProfessionalPermission
 from ...contributor import Contributor
 from ...pubsub import send_to_changelog
 
+
 tg = t.g
 t = t.betheprofessional
 

general/betheprofessional/models.py

@@ -1,7 +1,8 @@
 from typing import Union
 
-from PyDrocsid.database import db, Base
-from sqlalchemy import Column, BigInteger
+from sqlalchemy import BigInteger, Column
+
+from PyDrocsid.database import Base, db
 
 
 class BTPRole(Base):

general/custom_commands/cog.py

@@ -7,28 +7,30 @@
 
 import requests
 from aiohttp import ClientSession
-from discord import Embed, TextChannel, NotFound, Forbidden, HTTPException, AllowedMentions, User
+from discord import AllowedMentions, Embed, Forbidden, HTTPException, NotFound, TextChannel, User
 from discord.ext import commands
-from discord.ext.commands import Context, guild_only, UserInputError, Converter, CommandError, Command
+from discord.ext.commands import Command, CommandError, Context, Converter, UserInputError, guild_only
 from urllib3.exceptions import LocationParseError
 
 from PyDrocsid.async_thread import run_in_thread
 from PyDrocsid.cog import Cog
-from PyDrocsid.command import reply, docs, no_documentation, add_reactions, Confirmation
+from PyDrocsid.command import Confirmation, add_reactions, docs, no_documentation, reply
 from PyDrocsid.command_edit import link_response
-from PyDrocsid.config import Contributor, Config
+from PyDrocsid.config import Config, Contributor
 from PyDrocsid.database import db, filter_by, select
 from PyDrocsid.embeds import send_long_embed
 from PyDrocsid.logger import get_logger
 from PyDrocsid.permission import BasePermissionLevel
 from PyDrocsid.redis import redis
 from PyDrocsid.translations import t
 from PyDrocsid.util import check_message_send_permissions
+
 from .colors import Colors
-from .models import CustomCommand, Alias
+from .models import Alias, CustomCommand
 from .permissions import CustomCommandsPermission
-from ...administration.permissions.cog import PermissionsCog, PermissionLevelConverter
-from ...pubsub import send_to_changelog, send_alert
+from ...administration.permissions.cog import PermissionLevelConverter, PermissionsCog
+from ...pubsub import send_alert, send_to_changelog
+
 
 logger = get_logger(__name__)
 

general/custom_commands/models.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-from typing import Union, Optional
+from typing import Optional, Union
 from uuid import uuid4
 
-from sqlalchemy import Column, Text, Boolean, BigInteger, ForeignKey, Integer, String
+from sqlalchemy import BigInteger, Boolean, Column, ForeignKey, Integer, String, Text
 from sqlalchemy.orm import relationship
 
-from PyDrocsid.database import db, Base
+from PyDrocsid.database import Base, db
 from PyDrocsid.permission import BasePermissionLevel
 
 

general/discord_bot_token_deleter/cog.py

@@ -3,14 +3,16 @@
 import re
 
 from aiohttp import ClientSession
-from discord import Message, Embed, Forbidden
+from discord import Embed, Forbidden, Message
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.material_colors import MaterialColors
 from PyDrocsid.translations import t
+
 from ...contributor import Contributor
 from ...pubsub import send_alert
 
+
 tg = t.g
 t = t.discord_bot_token_deleter
 

general/news/cog.py

@@ -1,22 +1,24 @@
 from typing import Optional
 
-from discord import Member, TextChannel, Role, Guild, HTTPException, Forbidden, Embed
+from discord import Embed, Forbidden, Guild, HTTPException, Member, Role, TextChannel
 from discord.ext import commands
-from discord.ext.commands import guild_only, Context, CommandError, UserInputError
+from discord.ext.commands import CommandError, Context, UserInputError, guild_only
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.command import reply
 from PyDrocsid.converter import Color
 from PyDrocsid.database import db, select
 from PyDrocsid.embeds import send_long_embed
 from PyDrocsid.translations import t
-from PyDrocsid.util import read_normal_message, attachment_to_file
+from PyDrocsid.util import attachment_to_file, read_normal_message
+
 from .colors import Colors
 from .models import NewsAuthorization
 from .permissions import NewsPermission
 from ...contributor import Contributor
 from ...pubsub import send_to_changelog
 
+
 tg = t.g
 t = t.news
 

general/news/models.py

@@ -1,7 +1,8 @@
-from typing import Union, Optional
+from typing import Optional, Union
 
-from PyDrocsid.database import db, Base
-from sqlalchemy import Column, BigInteger
+from sqlalchemy import BigInteger, Column
+
+from PyDrocsid.database import Base, db
 
 
 class NewsAuthorization(Base):

general/polls/cog.py

@@ -2,22 +2,24 @@
 import string
 from typing import Optional, Tuple
 
-from discord import Embed, Message, PartialEmoji, Member, Forbidden, Guild
+from discord import Embed, Forbidden, Guild, Member, Message, PartialEmoji
 from discord.ext import commands
-from discord.ext.commands import Context, guild_only, CommandError
+from discord.ext.commands import CommandError, Context, guild_only
 from discord.utils import utcnow
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.embeds import EmbedLimits
-from PyDrocsid.emojis import name_to_emoji, emoji_to_name
+from PyDrocsid.emojis import emoji_to_name, name_to_emoji
 from PyDrocsid.events import StopEventHandling
 from PyDrocsid.settings import RoleSettings
 from PyDrocsid.translations import t
-from PyDrocsid.util import is_teamler, check_wastebasket
+from PyDrocsid.util import check_wastebasket, is_teamler
+
 from .colors import Colors
 from .permissions import PollsPermission
 from ...contributor import Contributor
 
+
 tg = t.g
 t = t.polls
 

general/reactionpin/cog.py

@@ -1,8 +1,8 @@
 from typing import Optional
 
-from discord import TextChannel, Message, Guild, Member, MessageType, HTTPException, PartialEmoji, Embed
+from discord import Embed, Guild, HTTPException, Member, Message, MessageType, PartialEmoji, TextChannel
 from discord.ext import commands
-from discord.ext.commands import Context, guild_only, CommandError, UserInputError
+from discord.ext.commands import CommandError, Context, UserInputError, guild_only
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.command import make_error, reply
@@ -11,13 +11,15 @@
 from PyDrocsid.events import StopEventHandling
 from PyDrocsid.settings import RoleSettings
 from PyDrocsid.translations import t
+
 from .colors import Colors
 from .models import ReactionPinChannel
 from .permissions import ReactionPinPermission
 from .settings import ReactionPinSettings
 from ...contributor import Contributor
 from ...pubsub import send_to_changelog
 
+
 tg = t.g
 t = t.reactionpin
 

general/reactionpin/models.py

@@ -2,8 +2,9 @@
 
 from typing import Union
 
-from PyDrocsid.database import db, Base
-from sqlalchemy import Column, BigInteger
+from sqlalchemy import BigInteger, Column
+
+from PyDrocsid.database import Base, db
 
 
 class ReactionPinChannel(Base):