feat: ディレクトリ名をabcからabstractに

yupix · Dec 24, 2022 · caaaa4e · caaaa4e
1 parent 4a36d13
commit caaaa4e
Show file tree

Hide file tree

Showing 26 changed files with 23 additions and 22 deletions.
diff --git a/.flake8 b/.flake8
@@ -3,5 +3,3 @@ per-file-ignores=
     ./mipac/__init__.py:E402,F403,F811,F401
     ./mipac/**/__init__.py:F403,F401
     ./mipac/_version.py:E501
-[tool.black]
-exclude = 'mipac/_version.py'
diff --git a/mipac/__init__.py b/mipac/__init__.py
@@ -10,13 +10,12 @@
 
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
-from .abc import *  # noqa: F403, F401
+from .abstract import *  # noqa: F403, F401
 from .models import *  # noqa: F403, F401
 from .types import *
 from .models import *
 from .manager import *
 from .actions import *
-from .abc import *
 
 from . import _version
 

diff --git a/mipac/abc/__init__.py → mipac/abstract/__init__.py b/mipac/abc/__init__.py → mipac/abstract/__init__.py
diff --git a/mipac/abc/action.py → mipac/abstract/action.py b/mipac/abc/action.py → mipac/abstract/action.py
diff --git a/mipac/abc/manager.py → mipac/abstract/manager.py b/mipac/abc/manager.py → mipac/abstract/manager.py
diff --git a/mipac/abc/model.py → mipac/abstract/model.py b/mipac/abc/model.py → mipac/abstract/model.py
diff --git a/mipac/actions/chat.py b/mipac/actions/chat.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abc.action import AbstractAction
+from mipac.abstract.action import AbstractAction
 from mipac.errors.base import ParameterError
 from mipac.http import HTTPClient, Route
 from mipac.models.chat import ChatMessage

diff --git a/mipac/actions/drive.py b/mipac/actions/drive.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.action import AbstractAction
+from mipac.abstract.action import AbstractAction
 from mipac.errors.base import ParameterError
 from mipac.http import HTTPClient, Route
 from mipac.types.drive import IDriveFile

diff --git a/mipac/actions/my.py b/mipac/actions/my.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abc.action import AbstractAction
+from mipac.abstract.action import AbstractAction
 from mipac.http import HTTPClient, Route
 from mipac.models.follow import FollowRequest
 from mipac.types.follow import IFollowRequest

diff --git a/mipac/actions/note.py b/mipac/actions/note.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, AsyncIterator, Optional
 
-from mipac.abc.action import AbstractAction
+from mipac.abstract.action import AbstractAction
 from mipac.errors.base import ParameterError
 from mipac.http import HTTPClient, Route
 from mipac.manager.favorite import FavoriteManager

diff --git a/mipac/manager/ad.py b/mipac/manager/ad.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:

diff --git a/mipac/manager/chart.py b/mipac/manager/chart.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.core.models.chart import RawActiveUsersChart, RawDriveChart
 from mipac.http import HTTPClient, Route
 

diff --git a/mipac/manager/drive.py b/mipac/manager/drive.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.actions.drive import DriveActions, FileActions, FolderActions
 from mipac.http import HTTPClient
 

diff --git a/mipac/manager/emoji.py b/mipac/manager/emoji.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.errors.base import NotExistRequiredData
 from mipac.http import HTTPClient, Route
 from mipac.util import check_multi_arg

diff --git a/mipac/manager/favorite.py b/mipac/manager/favorite.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:

diff --git a/mipac/manager/follow.py b/mipac/manager/follow.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 from mipac.models.user import FollowRequest, UserDetailed
 from mipac.types.user import IFollowRequest

diff --git a/mipac/manager/moderator.py b/mipac/manager/moderator.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:

diff --git a/mipac/manager/my.py b/mipac/manager/my.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.actions.my import MyActions
 from mipac.http import HTTPClient
 

diff --git a/mipac/manager/note.py b/mipac/manager/note.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.actions.note import ClientNoteActions, NoteActions
 from mipac.http import HTTPClient, Route
 

diff --git a/mipac/manager/page.py b/mipac/manager/page.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:

diff --git a/mipac/manager/reaction.py b/mipac/manager/reaction.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 from mipac.models.emoji import CustomEmoji
 from mipac.types.instance import IInstanceMetaLite

diff --git a/mipac/manager/user.py b/mipac/manager/user.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac.abc.manager import AbstractManager
+from mipac.abstract.manager import AbstractManager
 from mipac.actions.user import UserActions
 from mipac.http import HTTPClient
 

diff --git a/mipac/types/__init__.py → mipac/types/__init___1.py b/mipac/types/__init__.py → mipac/types/__init___1.py
diff --git a/mipac/types/user.py b/mipac/types/user.py
@@ -3,7 +3,6 @@
 from typing import TYPE_CHECKING, List, Literal, TypedDict
 
 if TYPE_CHECKING:
-    from mipac.types.channel import IChannel
     from mipac.types.emoji import ICustomEmojiLite
     from mipac.types.instance import IInstanceLite
     from mipac.types.note import INote

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,7 @@
 [tool.black]
 line-length = 79
+exclude = 'mipac/_version.py'
+
 
 [tool.isort]
 profile = "black"
@@ -8,3 +10,6 @@ line_length = 79
 [build-system]
 requires = ["setuptools", "versioneer[toml]"]
 build-backend = "setuptools.build_meta"
+
+[tool.ruff.per-file-ignores]
+"__init__.py" = ["E402", "F403"]
diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
 
 packages = [
     'mipac',
-    'mipac.abc',
+    'mipac.abstract',
     'mipac.actions',
     'mipac.core',
     'mipac.core.models',