web3 7.9.0__tar.gz → 7.10.0__tar.gz

{web3-7.9.0/web3.egg-info → web3-7.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: web3
-Version: 7.9.0
+Version: 7.10.0
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -33,7 +33,7 @@ Requires-Dist: pywin32>=223; platform_system == "Windows"
 Requires-Dist: requests>=2.23.0
 Requires-Dist: typing-extensions>=4.0.1
 Requires-Dist: types-requests>=2.0.0
-Requires-Dist: websockets<14.0.0,>=10.0.0
+Requires-Dist: websockets<16.0.0,>=10.0.0
 Requires-Dist: pyunormalize>=15.0.0
 Provides-Extra: tester
 Requires-Dist: eth-tester[py-evm]<0.13.0b1,>=0.12.0b1; extra == "tester"
@@ -86,6 +86,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{web3-7.9.0 → web3-7.10.0}/pyproject.toml

@@ -127,7 +127,7 @@ name = "Removals"
 showcontent = true
 
 [tool.bumpversion]
-current_version = "7.9.0"
+current_version = "7.10.0"
 parse = """
     (?P<major>\\d+)
     \\.(?P<minor>\\d+)

{web3-7.9.0 → web3-7.10.0}/setup.py

@@ -55,7 +55,7 @@ with open("./README.md") as readme:
 setup(
     name="web3",
     # *IMPORTANT*: Don't manually change the version here. See Contributing docs for the release process.
-    version="7.9.0",
+    version="7.10.0",
     description="""web3: A Python library for interacting with Ethereum""",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -78,7 +78,7 @@ setup(
         "requests>=2.23.0",
         "typing-extensions>=4.0.1",
         "types-requests>=2.0.0",
-        "websockets>=10.0.0,<14.0.0",
+        "websockets>=10.0.0,<16.0.0",
         "pyunormalize>=15.0.0",
     ],
     python_requires=">=3.8, <4",

{web3-7.9.0 → web3-7.10.0}/tests/core/providers/test_legacy_websocket_provider.py

@@ -7,7 +7,9 @@ from threading import (
     Thread,
 )
 
-import websockets
+from websockets.legacy.server import (
+    serve,
+)
 
 from tests.utils import (
     wait_for_ws,
@@ -35,7 +37,7 @@ def start_websocket_server(open_port):
             await websocket.send(data)
 
         asyncio.set_event_loop(event_loop)
-        server = websockets.serve(empty_server, "127.0.0.1", open_port)
+        server = serve(empty_server, "127.0.0.1", open_port)
         event_loop.run_until_complete(server)
         event_loop.run_forever()
 

{web3-7.9.0 → web3-7.10.0}/tests/utils.py

@@ -2,7 +2,9 @@ import asyncio
 import socket
 import time
 
-import websockets
+from websockets.legacy.client import (
+    connect,
+)
 
 from web3._utils.threads import (
     Timeout,
@@ -43,7 +45,7 @@ async def wait_for_ws(endpoint_uri, timeout=10):
     start = time.time()
     while time.time() < start + timeout:
         try:
-            async with websockets.connect(uri=endpoint_uri):
+            async with connect(uri=endpoint_uri):
                 pass
         except OSError:
             await asyncio.sleep(0.01)

{web3-7.9.0 → web3-7.10.0}/web3/_utils/abi.py

@@ -131,7 +131,7 @@ def filter_by_argument_name(
     argument_names: Collection[str], contract_abi: ABI
 ) -> Sequence[ABIElement]:
     """
-    Return a list of each ``ABIElement`` which contain arguments matching provided
+    Return a list of each ``ABIElement`` which contains arguments matching provided
     names.
     """
     abis_with_matching_args = []
@@ -153,7 +153,7 @@ def filter_by_argument_type(
     argument_types: Collection[str], contract_abi: ABI
 ) -> List[ABIElement]:
     """
-    Return a list of each ``ABIElement`` which contain arguments matching provided
+    Return a list of each ``ABIElement`` which contains arguments matching provided
     types.
     """
     abis_with_matching_args = []
@@ -429,7 +429,7 @@ def find_constructor_abi_element_by_type(contract_abi: ABI) -> ABIConstructor:
     Find the constructor ABI element in the contract ABI.
 
     This function is often used in place of `web3.utils.abi.get_abi_element` to find
-    a constructor without considering it's argument types. This is used prior to
+    a constructor without considering its argument types. This is used prior to
     encoding the abi, since the argument types are not known at that time.
     """
     candidates = [abi for abi in contract_abi if abi["type"] == "constructor"]

{web3-7.9.0 → web3-7.10.0}/web3/_utils/batching.py

@@ -201,7 +201,7 @@ def sort_batch_response_by_response_ids(
     responses: List["RPCResponse"],
 ) -> List["RPCResponse"]:
     if all(response.get("id") is not None for response in responses):
-        # If all responses have an `id`, sort them by `id, since the JSON-RPC 2.0 spec
+        # If all responses have an `id`, sort them by `id`, since the JSON-RPC 2.0 spec
         # doesn't guarantee order.
         return sorted(responses, key=lambda response: response["id"])
     else:

{web3-7.9.0 → web3-7.10.0}/web3/_utils/validation.py

@@ -131,7 +131,7 @@ def validate_abi_value(abi_type: TypeStr, value: Any) -> None:
                 )
             if specified_length != len(value):
                 raise Web3TypeError(
-                    "The following array length does not the length specified"
+                    "The following array length does not match the length specified "
                     f"by the abi-type, {abi_type}: {value}"
                 )
 

{web3-7.9.0 → web3-7.10.0}/web3/gas_strategies/rpc.py

@@ -15,6 +15,6 @@ def rpc_gas_price_strategy(
     w3: Web3, transaction_params: Optional[TxParams] = None
 ) -> Wei:
     """
-    A simple gas price strategy deriving it's value from the eth_gasPrice JSON-RPC call.
+    A simple gas price strategy deriving its value from the eth_gasPrice JSON-RPC call.
     """
     return w3.eth.gas_price

{web3-7.9.0 → web3-7.10.0}/web3/providers/async_base.py

@@ -53,7 +53,7 @@ from web3.utils import (
 )
 
 if TYPE_CHECKING:
-    from websockets import (
+    from websockets.legacy.client import (
         WebSocketClientProtocol,
     )
 

{web3-7.9.0 → web3-7.10.0}/web3/providers/legacy_websocket.py

@@ -21,11 +21,9 @@ from typing import (
 from eth_typing import (
     URI,
 )
-from websockets.client import (
-    connect,
-)
 from websockets.legacy.client import (
     WebSocketClientProtocol,
+    connect,
 )
 
 from web3._utils.batching import (

{web3-7.9.0 → web3-7.10.0}/web3/providers/persistent/persistent.py

@@ -68,11 +68,15 @@ class PersistentConnectionProvider(AsyncJSONBaseProvider, ABC):
     logger = logging.getLogger("web3.providers.PersistentConnectionProvider")
     has_persistent_connection = True
 
-    _send_func_cache: Tuple[int, Callable[..., Coroutine[Any, Any, RPCRequest]]] = (
+    _send_func_cache: Tuple[
+        Optional[int], Optional[Callable[..., Coroutine[Any, Any, RPCRequest]]]
+    ] = (
         None,
         None,
     )
-    _recv_func_cache: Tuple[int, Callable[..., Coroutine[Any, Any, RPCResponse]]] = (
+    _recv_func_cache: Tuple[
+        Optional[int], Optional[Callable[..., Coroutine[Any, Any, RPCResponse]]]
+    ] = (
         None,
         None,
     )

{web3-7.9.0 → web3-7.10.0}/web3/providers/persistent/websocket.py

@@ -15,16 +15,14 @@ from eth_typing import (
 from toolz import (
     merge,
 )
-from websockets import (
-    WebSocketClientProtocol,
-)
-from websockets.client import (
-    connect,
-)
 from websockets.exceptions import (
     ConnectionClosedOK,
     WebSocketException,
 )
+from websockets.legacy.client import (
+    WebSocketClientProtocol,
+    connect,
+)
 
 from web3.exceptions import (
     PersistentConnectionClosedOK,

{web3-7.9.0 → web3-7.10.0/web3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: web3
-Version: 7.9.0
+Version: 7.10.0
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -33,7 +33,7 @@ Requires-Dist: pywin32>=223; platform_system == "Windows"
 Requires-Dist: requests>=2.23.0
 Requires-Dist: typing-extensions>=4.0.1
 Requires-Dist: types-requests>=2.0.0
-Requires-Dist: websockets<14.0.0,>=10.0.0
+Requires-Dist: websockets<16.0.0,>=10.0.0
 Requires-Dist: pyunormalize>=15.0.0
 Provides-Extra: tester
 Requires-Dist: eth-tester[py-evm]<0.13.0b1,>=0.12.0b1; extra == "tester"
@@ -86,6 +86,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{web3-7.9.0 → web3-7.10.0}/web3.egg-info/requires.txt

@@ -9,7 +9,7 @@ pydantic>=2.4.0
 requests>=2.23.0
 typing-extensions>=4.0.1
 types-requests>=2.0.0
-websockets<14.0.0,>=10.0.0
+websockets<16.0.0,>=10.0.0
 pyunormalize>=15.0.0
 
 [:platform_system == "Windows"]