Skip to content

Commit

Permalink
feat!: Ape 0.8 target (#25)
Browse files Browse the repository at this point in the history
  • Loading branch information
antazoey authored May 31, 2024
1 parent 395739f commit c31eec3
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 18 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/draft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
jobs:
update-draft:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- uses: release-drafter/release-drafter@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
# TODO: Replace with macos-latest when works again.
# https://github.com/actions/setup-python/issues/808
os: [ubuntu-latest, macos-12] # eventually add `windows-latest`
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
python-version: [3.9, "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Ecosystem Plugin for Fantom support in Ape

## Dependencies

- [python3](https://www.python.org/downloads) version 3.8 up to 3.12.
- [python3](https://www.python.org/downloads) version 3.9 up to 3.12.

## Installation

Expand Down
4 changes: 2 additions & 2 deletions ape_fantom/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from ape import plugins
from ape.api.networks import LOCAL_NETWORK_NAME, ForkedNetworkAPI, NetworkAPI, create_network_type
from ape_geth import GethProvider
from ape_node import Node
from ape_test import LocalProvider

from .ecosystem import NETWORKS, Fantom, FantomConfig
Expand Down Expand Up @@ -29,6 +29,6 @@ def networks():
@plugins.register(plugins.ProviderPlugin)
def providers():
for network_name in NETWORKS:
yield "fantom", network_name, GethProvider
yield "fantom", network_name, Node

yield "fantom", LOCAL_NETWORK_NAME, LocalProvider
4 changes: 2 additions & 2 deletions ape_fantom/ecosystem.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import ClassVar, Dict, Tuple, cast
from typing import ClassVar, cast

from ape_ethereum.ecosystem import (
BaseEthereumConfig,
Expand All @@ -15,7 +15,7 @@


class FantomConfig(BaseEthereumConfig):
NETWORKS: ClassVar[Dict[str, Tuple[int, int]]] = NETWORKS
NETWORKS: ClassVar[dict[str, tuple[int, int]]] = NETWORKS
opera: NetworkConfig = create_network_config(block_time=0, required_confirmations=0)
testnet: NetworkConfig = create_network_config(block_time=0, required_confirmations=0)

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ write_to = "ape_fantom/version.py"

[tool.black]
line-length = 100
target-version = ['py38', 'py39', 'py310', 'py311', 'py312']
target-version = ['py39', 'py310', 'py311', 'py312']
include = '\.pyi?$'

[tool.pytest.ini_options]
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
url="https://github.com/ApeWorX/ape-fantom",
include_package_data=True,
install_requires=[
"eth-ape>=0.7.6,<0.8",
"eth-ape>=0.8.1,<0.9",
"ethpm-types", # Use same version as eth-ape
],
python_requires=">=3.8,<4",
python_requires=">=3.9,<4",
extras_require=extras_require,
py_modules=["ape_fantom"],
license="Apache-2.0",
Expand All @@ -79,7 +79,6 @@
"Operating System :: MacOS",
"Operating System :: POSIX",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand Down
16 changes: 8 additions & 8 deletions tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

EXPECTED_OUTPUT = """
fantom
├── local (default)
│ └── test (default)
├── opera
│ └── geth (default)
├── testnet
│ └── geth (default)
└── local (default)
└── test (default)
│ └── node (default)
└── testnet
└── node (default)
""".strip()


Expand Down Expand Up @@ -45,8 +45,8 @@ def assert_rich_text(actual: str, expected: str):


def test_networks(runner, cli, fantom):
fantom.opera.set_default_provider("geth")
fantom.testnet.set_default_provider("geth")
fantom.opera.set_default_provider("node")
fantom.testnet.set_default_provider("node")

result = runner.invoke(cli, ["networks", "list"])
result = runner.invoke(cli, ("networks", "list"))
assert_rich_text(result.output, EXPECTED_OUTPUT)

0 comments on commit c31eec3

Please sign in to comment.