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.

Sign up for GitHub

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

Upgrade pytest to 6.2.3 #1065

Merged
merged 3 commits into from
Apr 19, 2021
Merged

Upgrade pytest to 6.2.3 #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eaf1dc
feat: upgrade pytest package req to 6.2.3
skellet0r Apr 17, 2021
7ce7e45
fix: deprecated web3.eth method
skellet0r Apr 17, 2021
e77b556
fix: modification of config.rootdir attribute
skellet0r Apr 17, 2021
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
2 changes: 1 addition & 1 deletion brownie/network/web3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions brownie/test/managers/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from pathlib import Path

import hypothesis
from py.path import local

import brownie
from brownie._config import CONFIG
Expand All @@ -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
Expand Down
6 changes: 1 addition & 5 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions requirements-windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down