From bd6cf060520628e70701865f07c11673a7e55bc7 Mon Sep 17 00:00:00 2001 From: Jiachen Wang Date: Mon, 28 Aug 2023 23:35:40 +0800 Subject: [PATCH 1/3] Update networks.md (#1629) docs: Ethereum spelling in example --- docs/userguides/networks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguides/networks.md b/docs/userguides/networks.md index aa00b2553a..4ea863dbf2 100644 --- a/docs/userguides/networks.md +++ b/docs/userguides/networks.md @@ -90,7 +90,7 @@ geth: If you would like to connect to a URI using the `geth` provider, you can specify a URI for the provider name in the `--network` option: ```bash -ape run script --network etheruem:mainnet:https://foo.bar +ape run script --network ethereum:mainnet:https://foo.bar ``` Additionally, if you want to connect to an unknown ecosystem or network, you can use the URI by itself. From 66703f0c3e71a63ae536a59c021934bf2285e687 Mon Sep 17 00:00:00 2001 From: antazoey Date: Mon, 28 Aug 2023 14:43:48 -0500 Subject: [PATCH 2/3] fix: attempt fixing geth install [APE-1333] (#1634) --- .github/workflows/test.yaml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9d22e0c00a..947c38bd0b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -67,7 +67,6 @@ jobs: env: GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GETH_VERSION: 1.12.0 steps: - uses: actions/checkout@v3 @@ -84,23 +83,10 @@ jobs: with: go-version: '^1.20.1' - - name: Cache Geth - id: cache-geth - uses: actions/cache@v3 - with: - path: $HOME/.local/bin - key: ${{ runner.os }}-geth-${{ env.GETH_VERSION }} - - name: Install Geth - if: steps.cache-geth.outputs.cache-hit != 'true' - run: | - mkdir -p $HOME/.local/bin - wget -O geth.tar.gz "https://github.com/ethereum/go-ethereum/archive/v$GETH_VERSION.tar.gz" - tar -zxvf geth.tar.gz - cd go-ethereum-$GETH_VERSION - make geth - cp ./build/bin/geth /usr/local/bin - geth version + uses: gacts/install-geth-tools@v1 + with: + version: 1.12.2 - name: Install Dependencies run: | From 0e584b317d649eb123a7746b592731d81ff69054 Mon Sep 17 00:00:00 2001 From: antazoey Date: Mon, 28 Aug 2023 15:04:45 -0500 Subject: [PATCH 3/3] fix: pluggy (#1633) --- setup.py | 2 +- src/ape/plugins/__init__.py | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index eceaab2310..e476577598 100644 --- a/setup.py +++ b/setup.py @@ -100,7 +100,7 @@ "lazyasd>=0.1.4", "packaging>=23.0,<24", "pandas>=1.3.0,<2", - "pluggy>=0.12,<2", + "pluggy>=1.3,<2", "pydantic>=1.10.8,<2", "PyGithub>=1.59,<2", "pytest>=6.0,<8.0", diff --git a/src/ape/plugins/__init__.py b/src/ape/plugins/__init__.py index 826d6bba12..bf42745450 100644 --- a/src/ape/plugins/__init__.py +++ b/src/ape/plugins/__init__.py @@ -2,7 +2,7 @@ import importlib import pkgutil import subprocess -from typing import Any, Callable, Generator, Iterator, List, Optional, Tuple, Type, cast +from typing import Any, Callable, Generator, Iterator, List, Optional, Tuple, Type from ape.__modules__ import __modules__ from ape.exceptions import ApeAttributeError @@ -42,10 +42,6 @@ class AllPluginHooks( # All hookspecs are registered plugin_manager.add_hookspecs(AllPluginHooks) -# Add cast so that mypy knows that pm.hook is actually a `Plugins` instance. -# Without this hint there really is no way for mypy to know this. -plugin_manager.hook = cast(AllPluginHooks, plugin_manager.hook) - def clean_plugin_name(name: str) -> str: return name.replace("_", "-").replace("ape-", "")