remove code that was needed for py<=37

newsfragments/3317.internal.rst

@@ -0,0 +1 @@
+Remove code conditionally necessary for ``python<=3.7``

setup.py

@@ -27,7 +27,6 @@
         "bumpversion",
         "flaky>=3.7.0",
         "hypothesis>=3.31.2",
-        "importlib-metadata<5.0;python_version<'3.8'",
         "pytest>=7.0.0",
         "pytest-asyncio>=0.18.1,<0.23",
         "pytest-mock>=1.10",

web3/__init__.py

@@ -1,14 +1,9 @@
 from eth_account import Account  # noqa: E402
 import sys
 
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import pkg_resources
+from importlib.metadata import version
 
-    __version__ = pkg_resources.get_distribution("web3").version
-else:
-    from importlib.metadata import version
-
-    __version__ = version("web3")
+__version__ = version("web3")
 
 
 from web3.main import (

web3/_utils/compat/__init__.py

@@ -9,9 +9,6 @@
 # imported from `typing`
 
 from typing_extensions import (
-    Literal,  # py38
     NotRequired,  # py311
-    Protocol,  # py38
-    TypedDict,  # py38
     Self,  # py311
 )

web3/_utils/empty.py

@@ -1,4 +1,4 @@
-from web3._utils.compat import (
+from typing import (
     Literal,
 )
 

web3/_utils/module_testing/module_testing_utils.py

@@ -7,6 +7,7 @@
     Collection,
     Dict,
     Generator,
+    Literal,
     Sequence,
     Union,
 )
@@ -28,9 +29,6 @@
     HexBytes,
 )
 
-from web3._utils.compat import (
-    Literal,
-)
 from web3._utils.request import (
     async_cache_and_return_session,
     cache_and_return_session,

web3/_utils/threads.py

@@ -12,12 +12,10 @@
     Any,
     Callable,
     Generic,
+    Literal,
     Type,
 )
 
-from web3._utils.compat import (
-    Literal,
-)
 from web3.types import (
     TReturn,
 )

web3/_utils/transactions.py

@@ -2,6 +2,7 @@
 from typing import (
     TYPE_CHECKING,
     List,
+    Literal,
     Optional,
     Union,
     cast,
@@ -19,9 +20,6 @@
     HexBytes,
 )
 
-from web3._utils.compat import (
-    Literal,
-)
 from web3._utils.utility_methods import (
     all_in_dict,
     any_in_dict,

web3/geth.py

@@ -5,6 +5,7 @@
     Dict,
     List,
     Optional,
+    Protocol,
     Tuple,
 )
 
@@ -18,9 +19,6 @@
     HexBytes,
 )
 
-from web3._utils.compat import (
-    Protocol,
-)
 from web3._utils.rpc_abi import (
     RPC,
 )

web3/middleware/formatting.py

@@ -3,6 +3,7 @@
     Any,
     Callable,
     Coroutine,
+    Literal,
     Optional,
     Union,
     cast,
@@ -21,7 +22,6 @@
     EthSubscriptionParams,
     Formatters,
     FormattersDict,
-    Literal,
     RPCEndpoint,
     RPCResponse,
 )

web3/providers/eth_tester/main.py

@@ -4,6 +4,7 @@
     Callable,
     Coroutine,
     Dict,
+    Literal,
     Optional,
     Union,
 )
@@ -18,9 +19,6 @@
     is_bytes,
 )
 
-from web3._utils.compat import (
-    Literal,
-)
 from web3.providers import (
     BaseProvider,
 )

web3/types.py

@@ -5,10 +5,12 @@
     Coroutine,
     Dict,
     List,
+    Literal,
     NewType,
     Optional,
     Sequence,
     Type,
+    TypedDict,
     TypeVar,
     Union,
 )
@@ -25,9 +27,7 @@
 )
 
 from web3._utils.compat import (
-    Literal,
     NotRequired,
-    TypedDict,
 )
 from web3._utils.function_identifiers import (
     FallbackFn,