diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md similarity index 100% rename from CODE_OF_CONDUCT.md rename to .github/CODE_OF_CONDUCT.md diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md diff --git a/.gitignore b/.gitignore index dd346ec..7f5365c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -data/database -data/grafana +data/ config.toml # editors diff --git a/README.md b/README.md index 2f0fec7..1791a10 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ You can reach me over Discord at `@airo.pi`. Feel free to open an issue if you e ## How to contribute -I would ❤️ to see your contribution! Refer to [CONTRIBUTING.md](/CONTRIBUTING.md) +I would ❤️ to see your contribution! Refer to [CONTRIBUTING.md](.github/CONTRIBUTING.md) ## License diff --git a/pyproject.toml b/pyproject.toml index fc4e90e..927156c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ skipsdist = true [testenv] deps = - -r requirements.txt + -r requirements.txt -r requirements-dev.txt commands = # pytest diff --git a/requirements-dev.txt b/requirements-dev.txt index 1dfeed0..3c77292 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,8 +1,5 @@ black bandit -toml tox pyright isort -pytest -flake8 diff --git a/requirements.txt b/requirements.txt index a9a0c45..80e7e19 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,4 +10,3 @@ two048 # a personal library topggpy==2.0.0a0 lingua-language-detector aiohttp -python-dateutil diff --git a/src/cogs/clear/__init__.py b/src/cogs/clear/__init__.py index 36ff9aa..900a7ef 100644 --- a/src/cogs/clear/__init__.py +++ b/src/cogs/clear/__init__.py @@ -3,12 +3,11 @@ import asyncio import logging import time -from typing import TYPE_CHECKING, AsyncGenerator, Awaitable, Callable, cast +from typing import TYPE_CHECKING, AsyncGenerator, Awaitable, Callable, Self, cast import discord from discord import app_commands, ui from discord.app_commands import Transform, locale_str as __ -from typing_extensions import Self from core import ExtendedCog, Menu, MessageDisplay, ResponseType, response_constructor from core.checkers import MaxConcurrency diff --git a/src/commands_exporter.py b/src/commands_exporter.py index 8ed29c7..9582033 100644 --- a/src/commands_exporter.py +++ b/src/commands_exporter.py @@ -4,11 +4,10 @@ import json from dataclasses import dataclass, field from enum import Enum -from typing import TYPE_CHECKING, Any, TypedDict, cast, overload +from typing import TYPE_CHECKING, Any, NotRequired, TypedDict, cast, overload import discord from discord import app_commands -from typing_extensions import NotRequired from core._config import define_config from core.extended_commands import MiscCommand, MiscCommandsType diff --git a/src/core/checkers/max_concurrency.py b/src/core/checkers/max_concurrency.py index ee2766e..6f195b0 100644 --- a/src/core/checkers/max_concurrency.py +++ b/src/core/checkers/max_concurrency.py @@ -3,9 +3,7 @@ import asyncio import logging from collections import deque -from typing import TYPE_CHECKING, Any, Callable, Deque, Hashable, TypeVar, Union - -from typing_extensions import Self +from typing import TYPE_CHECKING, Any, Callable, Deque, Hashable, Self, TypeVar, Union from ..errors import MaxConcurrencyReached from ..extended_commands import misc_check as misc_check diff --git a/src/core/extended_commands.py b/src/core/extended_commands.py index 488fd16..6c9fdb5 100644 --- a/src/core/extended_commands.py +++ b/src/core/extended_commands.py @@ -23,7 +23,6 @@ from discord import ClientUser, Member, Permissions, User from discord.ext import commands from discord.utils import maybe_coroutine -from typing_extensions import TypeVar from ._types import BotT, CogT from .errors import MiscCheckFailure, MiscCommandError, MiscNoPrivateMessage, UnexpectedError diff --git a/src/core/view_menus.py b/src/core/view_menus.py index dab6b28..c075e64 100644 --- a/src/core/view_menus.py +++ b/src/core/view_menus.py @@ -1,7 +1,7 @@ from __future__ import annotations import os -from typing import TYPE_CHECKING, Any, Generic, Self +from typing import TYPE_CHECKING, Any, Generic, Self, TypeVar import discord from discord import ui diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 1f0f8e1..0000000 --- a/tox.ini +++ /dev/null @@ -1,13 +0,0 @@ -[tox] -skipsdist = true - -[testenv] -deps = - -r requirements.txt - -r requirements-dev.txt -commands = - # pytest - black --check src/ - bandit -r src/ tests/ -c pyproject.toml - isort ./src/ --check - pyright src/