Skip to content

Commit

Permalink
Merge pull request #6 from gnarvaja/web3py-6
Browse files Browse the repository at this point in the history
Upgrade to web3py6 and add support for external libraries. Remove Brownie
  • Loading branch information
gnpar authored Feb 15, 2024
2 parents 6e3d5d3 + b0f35d4 commit 7ca35e0
Show file tree
Hide file tree
Showing 39 changed files with 18,002 additions and 1,608 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install tox tox-gh-actions
npm install -g ganache@7.6.0
- name: Initialize hardhat
run: |
cd tests/hardhat-project
npm ci
npx hardhat compile
npx hardhat node &
- name: Test with tox
run: tox
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,9 @@ MANIFEST
# Per-project virtualenvs
.venv*/
.conda*/
.env

# Tests hardhat project
tests/hardhat-project/artifacts
tests/hardhat-project/cache
tests/hardhat-project/node_modules
2 changes: 2 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[settings]
profile = black
41 changes: 41 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
exclude: "^docs/conf.py"

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
hooks:
- id: trailing-whitespace
- id: check-added-large-files
- id: check-ast
- id: check-json
- id: check-merge-conflict
- id: check-xml
- id: check-yaml
- id: debug-statements
- id: end-of-file-fixer
- id: requirements-txt-fixer
- id: mixed-line-ending
args: ["--fix=auto"] # replace 'auto' with 'lf' to enforce Linux/Mac line endings or 'crlf' for Windows

- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: isort

- repo: https://github.com/psf/black
rev: stable
hooks:
- id: black
language_version: python3

- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
hooks:
- id: flake8
## You can add flake8 plugins via `additional_dependencies`:
# additional_dependencies: [flake8-bugbear]

- repo: https://github.com/zricethezav/gitleaks
rev: v8.12.0
hooks:
- id: gitleaks-docker
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ build-backend = "setuptools.build_meta"
[tool.setuptools_scm]
# See configuration details in https://github.com/pypa/setuptools_scm
version_scheme = "no-guess-dev"

[tool.black]
line-length = 110
14 changes: 4 additions & 10 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ install_requires =
m9g
environs
requests
hexbytes
importlib-metadata; python_version<"3.8"


Expand All @@ -61,13 +62,12 @@ exclude =
# Add here additional requirements for extra features, to install with:
# `pip install eth-prototype[PDF]` like:
# PDF = ReportLab; RXP
brownie = eth-brownie
web3 =
web3
eth-event

defender =
boto3
warrant @ git+https://github.com/gnarvaja/warrant.git#egg=warrant

gmpy2 =
gmpy2
Expand All @@ -79,19 +79,13 @@ testing =
gmpy2
pytest-cov

testing-br =
eth-brownie
setuptools
pytest
pytest-cov

testing-w3 =
web3[tester]
setuptools
pytest
eth-event
pytest-cov
boto3
warrant @ git+https://github.com/gnarvaja/warrant.git#egg=warrant

[options.entry_points]
# Add here console scripts like:
Expand Down Expand Up @@ -151,4 +145,4 @@ exclude =
# This will be used when updating. Do not change!
version = 4.0.2
package = ethproto
extensions =
extensions =
221 changes: 0 additions & 221 deletions src/ethproto/brwrappers.py

This file was deleted.

Loading

0 comments on commit 7ca35e0

Please sign in to comment.