Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump ape to 0.5 #29

Merged
merged 3 commits into from Sep 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest] # eventually add `windows-latest`
python-version: [3.7, 3.8, 3.9, "3.10"]
python-version: [3.8, 3.9, "3.10"]

env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -75,6 +75,7 @@ jobs:

- name: Run Tests
run: pytest -m "not fuzzing" -s --cov=src -n auto

# NOTE: uncomment this block after you've marked tests with @pytest.mark.fuzzing
# fuzzing:
# runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ repos:


default_language_version:
python: python3.8
python: python3.9
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## Dependencies

* [python3](https://www.python.org/downloads) version 3.7.2 or greater, python3-dev
* [python3](https://www.python.org/downloads) version 3.8 or greater, python3-dev

## Installation

Expand Down
4 changes: 2 additions & 2 deletions ape_alchemy/providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ def get_transaction_trace(self, txn_hash: str) -> Iterator[TraceFrame]:
result = self._make_request("debug_traceTransaction", [txn_hash])
frames = result.get("structLogs", [])
for frame in frames:
yield TraceFrame(**frame)
yield TraceFrame.parse_obj(frame)

def get_call_tree(self, txn_hash: str) -> CallTreeNode:
receipt = self.get_transaction(txn_hash)
receipt = self.get_receipt(txn_hash)
raw_trace_list = self._make_request("trace_transaction", [txn_hash])
trace_list = ParityTraceList.parse_obj(raw_trace_list)
return get_calltree_from_parity_trace(trace_list, gas_cost=receipt.gas_used)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ write_to = "ape_alchemy/version.py"

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

[tool.pytest.ini_options]
Expand Down
8 changes: 3 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"twine", # Package upload tool
],
"dev": [
"commitizen>=2.19,<2.20", # Manage commits and publishing releases
"commitizen", # Manage commits and publishing releases
"pre-commit", # Ensure that linters are run prior to commiting
"pytest-watch", # `ptw` test watcher/runner
"IPython", # Console for interacting
Expand Down Expand Up @@ -65,12 +65,11 @@
url="https://github.com/ApeWorX/ape-alchemy",
include_package_data=True,
install_requires=[
"eth-ape>=0.4.0,<0.5.0",
"eth-ape>=0.5.0,<0.6",
"web3", # Get web3 version from ape
"importlib-metadata ; python_version<'3.8'",
"requests",
],
python_requires=">=3.7.2,<4",
python_requires=">=3.8,<3.11",
extras_require=extras_require,
py_modules=["ape_alchemy"],
license="Apache-2.0",
Expand All @@ -86,7 +85,6 @@
"Operating System :: MacOS",
"Operating System :: POSIX",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down