Update isort and add changes from migration guide

- Move isort config into a single config file, ``.isort.cfg``, rather than having it spread between ``tox.ini`` and ``pyproject.toml``
- Update ``isort``, add recommended changes for migrating to isort >5

Author: fselmo

.isort.cfg

@@ -0,0 +1,16 @@
+[settings]
+profile=black
+force_grid_wrap=1
+multi_line_output=3
+honor_noqa=true
+float_to_top=true
+combine_as_imports=true
+force_sort_within_sections=true
+include_trailing_comma=true
+extra_standard_library=pytest
+known_first_party=web3,ens,ethpm
+known_third_party=lru,eth_tester
+line_length=88
+use_parentheses=true
+# skip `__init__.py` files because sometimes order of initialization is important
+skip=__init__.py,web3/main.py,web3/utils/windows.py,ethpm/ethpm-spec/,ethpm/_utils/protobuf/ipfs_file_pb2.py,

ens/__init__.py

@@ -9,7 +9,6 @@
 from .ens import (
     ENS,
 )
-
 from .exceptions import (
     AddressMismatch,
     BidTooLow,

ens/async_ens.py

@@ -29,7 +29,9 @@
     HexBytes,
 )
 
-from ens import abis
+from ens import (
+    abis,
+)
 from ens.base_ens import (
     BaseENS,
 )

ens/auto.py

@@ -1,3 +1,5 @@
-from ens import ENS
+from ens import (
+    ENS,
+)
 
 ns = ENS()

ens/ens.py

@@ -29,7 +29,9 @@
     HexBytes,
 )
 
-from ens import abis
+from ens import (
+    abis,
+)
 from ens.base_ens import (
     BaseENS,
 )

ens/utils.py

@@ -54,7 +54,9 @@
 
 
 if TYPE_CHECKING:
-    from web3 import Web3 as _Web3  # noqa: F401
+    from web3 import (  # noqa: F401
+        Web3 as _Web3,
+    )
     from web3.providers import (  # noqa: F401
         AsyncBaseProvider,
         BaseProvider,
@@ -67,7 +69,9 @@
 
 
 def Web3() -> Type["_Web3"]:
-    from web3 import Web3 as Web3Main
+    from web3 import (
+        Web3 as Web3Main,
+    )
 
     return Web3Main
 
@@ -76,8 +80,12 @@ def init_web3(
     provider: "BaseProvider" = cast("BaseProvider", default),
     middlewares: Optional[Sequence[Tuple["Middleware", str]]] = None,
 ) -> "_Web3":
-    from web3 import Web3 as Web3Main
-    from web3.eth import Eth as EthMain
+    from web3 import (
+        Web3 as Web3Main,
+    )
+    from web3.eth import (
+        Eth as EthMain,
+    )
 
     if provider is default:
         w3 = Web3Main(ens=None, modules={"eth": (EthMain)})
@@ -88,7 +96,9 @@ def init_web3(
 
 
 def customize_web3(w3: "_Web3") -> "_Web3":
-    from web3.middleware import make_stalecheck_middleware
+    from web3.middleware import (
+        make_stalecheck_middleware,
+    )
 
     if w3.middleware_onion.get("name_to_address"):
         w3.middleware_onion.remove("name_to_address")
@@ -280,8 +290,12 @@ def init_async_web3(
     provider: "AsyncBaseProvider" = cast("AsyncBaseProvider", default),
     middlewares: Optional[Sequence[Tuple["Middleware", str]]] = (),
 ) -> "_Web3":
-    from web3 import Web3 as Web3Main
-    from web3.eth import AsyncEth as AsyncEthMain
+    from web3 import (
+        Web3 as Web3Main,
+    )
+    from web3.eth import (
+        AsyncEth as AsyncEthMain,
+    )
 
     middlewares = list(middlewares)
     for i, (middleware, name) in enumerate(middlewares):
@@ -309,7 +323,9 @@ def init_async_web3(
 async def _async_ens_stalecheck_middleware(
     make_request: Callable[["RPCEndpoint", Any], Any], w3: "_Web3"
 ) -> "Middleware":
-    from web3.middleware import async_make_stalecheck_middleware
+    from web3.middleware import (
+        async_make_stalecheck_middleware,
+    )
 
     middleware = await async_make_stalecheck_middleware(ACCEPTABLE_STALE_HOURS * 3600)
     return await middleware(make_request, w3)

ethpm/_utils/backend.py

@@ -28,7 +28,9 @@
 )
 
 try:
-    from ipfshttpclient.exceptions import ConnectionError as IpfsConnectionError
+    from ipfshttpclient.exceptions import (
+        ConnectionError as IpfsConnectionError,
+    )
 except ImportError:
     pass
 

ethpm/backends/registry.py

@@ -16,7 +16,9 @@
     is_address,
 )
 
-from ens import ENS
+from ens import (
+    ENS,
+)
 from ethpm._utils.registry import (
     fetch_standard_registry_abi,
 )
@@ -46,7 +48,10 @@ class RegistryURIBackend(BaseURIBackend):
     """
 
     def __init__(self) -> None:
-        from web3 import Web3, WebsocketProvider
+        from web3 import (
+            Web3,
+            WebsocketProvider,
+        )
 
         w3 = Web3(WebsocketProvider())
 
@@ -90,7 +95,10 @@ def parse_registry_uri(uri: str) -> RegistryURI:
     Validate and return (authority, chain_id, pkg_name, version)
     from a valid registry URI.
     """
-    from web3 import Web3, WebsocketProvider
+    from web3 import (
+        Web3,
+        WebsocketProvider,
+    )
 
     w3 = Web3(WebsocketProvider())
 

ethpm/validation/misc.py

@@ -5,7 +5,9 @@
 from ethpm.exceptions import (
     EthPMValidationError,
 )
-from web3 import Web3
+from web3 import (
+    Web3,
+)
 
 
 def validate_w3_instance(w3: "Web3") -> None:

ethpm/validation/uri.py

@@ -126,7 +126,9 @@ def validate_single_matching_uri(all_blockchain_uris: List[str], w3: "Web3") ->
     Return a single block URI after validating that it is the *only* URI in
     all_blockchain_uris that matches the w3 instance.
     """
-    from ethpm.uri import check_if_chain_matches_chain_uri
+    from ethpm.uri import (
+        check_if_chain_matches_chain_uri,
+    )
 
     matching_uris = [
         uri for uri in all_blockchain_uris if check_if_chain_matches_chain_uri(w3, uri)