From 3eaf1dcc7a7da1be6039e58e81f731d5b31cd437 Mon Sep 17 00:00:00 2001 From: Edward Amor Date: Sat, 17 Apr 2021 03:20:00 -0400 Subject: [PATCH 1/3] feat: upgrade pytest package req to 6.2.3 --- requirements-dev.txt | 6 +----- requirements-windows.txt | 6 +----- requirements.txt | 6 ++---- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b61f5a482..b734eff00 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -80,10 +80,6 @@ markupsafe==1.1.1 # via jinja2 mccabe==0.6.1 # via flake8 -more-itertools==8.7.0 - # via - # -c requirements.txt - # pytest mypy-extensions==0.4.3 # via mypy mypy==0.720 @@ -130,7 +126,7 @@ pytest-cov==2.10.1 # via -r requirements-dev.in pytest-mock==3.3.1 # via -r requirements-dev.in -pytest==6.0.1 +pytest==6.2.3 # via # -c requirements.txt # pytest-cov diff --git a/requirements-windows.txt b/requirements-windows.txt index ee85d9e39..a969773f0 100644 --- a/requirements-windows.txt +++ b/requirements-windows.txt @@ -140,10 +140,6 @@ lru-dict==1.1.7 # via # -r requirements.txt # web3 -more-itertools==8.7.0 - # via - # -r requirements.txt - # pytest multiaddr==0.0.9 # via # -r requirements.txt @@ -219,7 +215,7 @@ pytest-forked==1.3.0 # pytest-xdist pytest-xdist==1.34.0 # via -r requirements.txt -pytest==6.0.1 +pytest==6.2.3 # via # -r requirements.txt # pytest-forked diff --git a/requirements.txt b/requirements.txt index e1a5489a1..dc5ef78b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile requirements.in +# pip-compile # apipkg==1.5 # via execnet @@ -102,8 +102,6 @@ jsonschema==3.2.0 # web3 lru-dict==1.1.7 # via web3 -more-itertools==8.7.0 - # via pytest multiaddr==0.0.9 # via ipfshttpclient mythx-models==1.9.1 @@ -154,7 +152,7 @@ pytest-forked==1.3.0 # via pytest-xdist pytest-xdist==1.34.0 # via -r requirements.in -pytest==6.0.1 +pytest==6.2.3 # via # -r requirements.in # pytest-forked From 7ce7e45e607d3c4cbf7d214b607d52473ea30f27 Mon Sep 17 00:00:00 2001 From: Edward Amor Date: Sat, 17 Apr 2021 06:12:00 -0400 Subject: [PATCH 2/3] fix: deprecated web3.eth method --- brownie/network/web3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brownie/network/web3.py b/brownie/network/web3.py index c8f4138fc..3e7d581af 100644 --- a/brownie/network/web3.py +++ b/brownie/network/web3.py @@ -207,7 +207,7 @@ def _resolve_address(domain: str) -> str: web3 = Web3() -web3.eth.setGasPriceStrategy(rpc_gas_price_strategy) +web3.eth.set_gas_price_strategy(rpc_gas_price_strategy) try: with _get_path().open() as fp: From e77b556623bb45e339b8382156570509c1a2561b Mon Sep 17 00:00:00 2001 From: Edward Amor Date: Sat, 17 Apr 2021 07:19:00 -0400 Subject: [PATCH 3/3] fix: modification of config.rootdir attribute --- brownie/test/managers/base.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/brownie/test/managers/base.py b/brownie/test/managers/base.py index d7a7cae00..f56e0f886 100644 --- a/brownie/test/managers/base.py +++ b/brownie/test/managers/base.py @@ -5,7 +5,6 @@ from pathlib import Path import hypothesis -from py.path import local import brownie from brownie._config import CONFIG @@ -27,7 +26,7 @@ def __init__(self, config, project): self.config = config # required when brownie project is in a subfolder of another project - config.rootdir = local(project._path) + config._rootpath = Path(project._path) self.project = project self.project_path = project._path