Take advantage of having dropped Python 3.7

aio_pika/__init__.py

@@ -13,12 +13,8 @@
 from .robust_queue import RobustQueue
 
 
-try:
-    from importlib.metadata import Distribution
-    __version__ = Distribution.from_name("aio-pika").version
-except ImportError:
-    import pkg_resources
-    __version__ = pkg_resources.get_distribution("aio-pika").version
+from importlib.metadata import Distribution
+__version__ = Distribution.from_name("aio-pika").version
 
 
 __all__ = (

aio_pika/abc.py

@@ -1,6 +1,5 @@
 import asyncio
 import dataclasses
-import sys
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from datetime import datetime, timedelta
@@ -10,15 +9,9 @@
 from typing import (
     Any, AsyncContextManager, AsyncIterable, Awaitable, Callable, Dict,
     Generator, Iterator, Mapping, Optional, Tuple, Type, TypeVar, Union,
-    overload,
+    overload, Literal, TypedDict,
 )
 
-
-if sys.version_info >= (3, 8):
-    from typing import Literal, TypedDict
-else:
-    from typing_extensions import Literal, TypedDict
-
 import aiormq.abc
 from aiormq.abc import ExceptionType
 from pamqp.common import Arguments, FieldValue

aio_pika/queue.py

@@ -1,8 +1,7 @@
 import asyncio
-import sys
 from functools import partial
 from types import TracebackType
-from typing import Any, Awaitable, Callable, Optional, Type, overload
+from typing import Any, Awaitable, Callable, Optional, Type, overload, Literal
 
 import aiormq
 from aiormq.abc import DeliveredMessage
@@ -19,12 +18,6 @@
 from .tools import CallbackCollection, create_task, ensure_awaitable
 
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
-
 log = get_logger(__name__)
 
 

docs/source/conf.py

@@ -23,12 +23,8 @@
 
 
 # noinspection PyUnresolvedReferences
-try:
-    from importlib.metadata import Distribution
-    __version__ = Distribution.from_name("aio-pika").version
-except ImportError:
-    import pkg_resources
-    __version__ = pkg_resources.get_distribution("aio-pika").version
+from importlib.metadata import Distribution
+__version__ = Distribution.from_name("aio-pika").version
 
 sys.path.insert(0, os.path.abspath(os.path.dirname("__file__")))
 

pyproject.toml

@@ -38,7 +38,6 @@ packages = [{ include = "aio_pika" }]
 python = "^3.8"
 aiormq = "~6.8.0"
 yarl = [{ version = '*'}]
-typing_extensions = [{ version = '*', python = "< 3.8" }]
 # for pkg_resources
 setuptools = [{ version = '*', python = "< 3.8" }]