From 60fd9f163102c5ccd487e5aae724f8bbcb36c6db Mon Sep 17 00:00:00 2001 From: kclowes Date: Wed, 15 Jun 2022 14:37:50 -0600 Subject: [PATCH 1/2] Add black to the auto directory --- tox.ini | 2 +- web3/auto/infura/endpoints.py | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/tox.ini b/tox.ini index 8da6ff5e69..c83659e771 100644 --- a/tox.ini +++ b/tox.ini @@ -64,7 +64,7 @@ basepython=python extras=linter commands= flake8 {toxinidir}/web3 {toxinidir}/ens {toxinidir}/ethpm {toxinidir}/tests --exclude {toxinidir}/ethpm/ethpm-spec - black {toxinidir}/ethpm {toxinidir}/web3/utils --exclude {toxinidir}/ethpm/ethpm-spec --check + black {toxinidir}/ethpm {toxinidir}/web3/auto {toxinidir}/web3/utils --exclude {toxinidir}/ethpm/ethpm-spec --check isort --recursive --check-only --diff {toxinidir}/web3/ {toxinidir}/ens/ {toxinidir}/ethpm/ {toxinidir}/tests/ mypy -p web3 -p ethpm -p ens --config-file {toxinidir}/mypy.ini diff --git a/web3/auto/infura/endpoints.py b/web3/auto/infura/endpoints.py index 8531e3c023..14af93fb19 100644 --- a/web3/auto/infura/endpoints.py +++ b/web3/auto/infura/endpoints.py @@ -16,21 +16,22 @@ InfuraKeyNotFound, ) -INFURA_MAINNET_DOMAIN = 'mainnet.infura.io' -INFURA_ROPSTEN_DOMAIN = 'ropsten.infura.io' -INFURA_GOERLI_DOMAIN = 'goerli.infura.io' -INFURA_RINKEBY_DOMAIN = 'rinkeby.infura.io' -INFURA_KOVAN_DOMAIN = 'kovan.infura.io' +INFURA_MAINNET_DOMAIN = "mainnet.infura.io" +INFURA_ROPSTEN_DOMAIN = "ropsten.infura.io" +INFURA_GOERLI_DOMAIN = "goerli.infura.io" +INFURA_RINKEBY_DOMAIN = "rinkeby.infura.io" +INFURA_KOVAN_DOMAIN = "kovan.infura.io" -WEBSOCKET_SCHEME = 'wss' -HTTP_SCHEME = 'https' +WEBSOCKET_SCHEME = "wss" +HTTP_SCHEME = "https" def load_api_key() -> str: # in web3py v6 remove outdated WEB3_INFURA_API_KEY - key = os.environ.get('WEB3_INFURA_PROJECT_ID', - os.environ.get('WEB3_INFURA_API_KEY', '')) - if key == '': + key = os.environ.get( + "WEB3_INFURA_PROJECT_ID", os.environ.get("WEB3_INFURA_API_KEY", "") + ) + if key == "": raise InfuraKeyNotFound( "No Infura Project ID found. Please ensure " "that the environment variable WEB3_INFURA_PROJECT_ID is set." @@ -39,25 +40,25 @@ def load_api_key() -> str: def load_secret() -> str: - return os.environ.get('WEB3_INFURA_API_SECRET', '') + return os.environ.get("WEB3_INFURA_API_SECRET", "") def build_http_headers() -> Optional[Dict[str, Tuple[str, str]]]: secret = load_secret() if secret: - headers = {'auth': ('', secret)} + headers = {"auth": ("", secret)} return headers return None def build_infura_url(domain: str) -> URI: - scheme = os.environ.get('WEB3_INFURA_SCHEME', WEBSOCKET_SCHEME) + scheme = os.environ.get("WEB3_INFURA_SCHEME", WEBSOCKET_SCHEME) key = load_api_key() secret = load_secret() - if scheme == WEBSOCKET_SCHEME and secret != '': + if scheme == WEBSOCKET_SCHEME and secret != "": return URI(f"{scheme}://:{secret}@{domain}/ws/v3/{key}") - elif scheme == WEBSOCKET_SCHEME and secret == '': + elif scheme == WEBSOCKET_SCHEME and secret == "": return URI(f"{scheme}://{domain}/ws/v3/{key}") elif scheme == HTTP_SCHEME: return URI(f"{scheme}://{domain}/v3/{key}") From 06208a594d323bd8fd5c1ec5ec35a264527b26b3 Mon Sep 17 00:00:00 2001 From: kclowes Date: Wed, 15 Jun 2022 14:43:48 -0600 Subject: [PATCH 2/2] Add newsfragment --- newsfragments/2514.misc.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/2514.misc.rst diff --git a/newsfragments/2514.misc.rst b/newsfragments/2514.misc.rst new file mode 100644 index 0000000000..c33c552472 --- /dev/null +++ b/newsfragments/2514.misc.rst @@ -0,0 +1 @@ +Add black checks to ``web3/auto``