Skip to content

Commit

Permalink
Merge pull request #735 from eth-brownie/v1.11.0
Browse files Browse the repository at this point in the history
v1.11.0
  • Loading branch information
iamdefinitelyahuman authored Aug 28, 2020
2 parents e34951a + 8a8a537 commit b651552
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 18 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ This changelog format is based on [Keep a Changelog](https://keepachangelog.com/
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased](https://github.com/eth-brownie/brownie)
## [1.11.0](https://github.com/eth-brownie/brownie/tree/v1.11.0) - 2020-08-28
### Added
- Support for multiple Vyper versions ([#731](https://github.com/eth-brownie/brownie/pull/731))

### Changed
- Use `solcx` v1.0.0 ([#733](https://github.com/eth-brownie/brownie/pull/733))
- Always enter console when using `brownie run -I` ([#732](https://github.com/eth-brownie/brownie/pull/732))
- Allow namespace collisions between interfaces ([#734](https://github.com/eth-brownie/brownie/pull/734))

### Fixed
- Ignore `TempProject` contracts when calculating coverage ([#730](https://github.com/eth-brownie/brownie/pull/730))

## [1.10.6](https://github.com/eth-brownie/brownie/tree/v1.10.6) - 2020-08-18
### Changed
Expand Down
2 changes: 1 addition & 1 deletion brownie/_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from brownie._singleton import _Singleton

__version__ = "1.10.6"
__version__ = "1.11.0"

BROWNIE_FOLDER = Path(__file__).parent
DATA_FOLDER = Path.home().joinpath(".brownie")
Expand Down
2 changes: 1 addition & 1 deletion brownie/project/scripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def _get_ast_hash(path: str) -> str:
else:
name = obj.module # type: ignore
try:
origin = importlib.util.find_spec(name).origin
origin = importlib.util.find_spec(name).origin # type: ignore
except Exception:
warnings.warn(
f"{Path(path).name}, unable to determine import spec for '{name}',"
Expand Down
14 changes: 7 additions & 7 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
bumpversion==0.6.0
coverage==5.1
coverage==5.2.1
flake8==3.8.3
isort==4.3.21
mypy==0.720
pytest-cov==2.9.0
pytest-mock==3.1.1
sphinx==3.0.4
sphinx_rtd_theme==0.4.3
tox==3.15.1
pytest-cov==2.10.1
pytest-mock==3.3.1
sphinx==3.2.1
sphinx_rtd_theme==0.5.0
tox==3.19.0
twine==3.1.1
wheel==0.34.2
wheel==0.35.1
12 changes: 6 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ eth-abi==2.1.1
eth-account==0.5.2
eth-event>=1.2.0,<2.0.0
eth-hash[pycryptodome]==0.2.0
eth-utils==1.9.3
eth-utils==1.9.4
hexbytes==0.2.1
hypothesis==5.26.0
prompt-toolkit==3.0.5
psutil>=5.7.0,<6.0.0
hypothesis==5.29.1
prompt-toolkit==3.0.6
psutil>=5.7.2,<6.0.0
py>=1.5.0
py-solc-ast>=1.2.5,<2.0.0
py-solc-x>=1.0.0,<2.0.0
pygments==2.6.1
pygments_lexer_solidity==0.5.1
pytest==5.4.3
pytest==6.0.1
pytest-xdist==1.34.0
pythx==1.6.1
pyyaml>=5.3.0,<6.0.0
requests>=2.23.0,<3.0.0
semantic-version==2.8.5
tqdm==4.48.0
tqdm==4.48.2
vvm>=0.0.2,<0.1.0
web3==5.11.1
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.10.6
current_version = 1.11.0

[bumpversion:file:setup.py]

Expand Down Expand Up @@ -28,7 +28,7 @@ follow_imports = silent
follow_imports = skip

[tool:pytest]
addopts =
addopts =
-p no:pytest-brownie
--cov brownie/
--cov-report term
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
setup(
name="eth-brownie",
packages=find_packages(),
version="1.10.6", # don't change this manually, use bumpversion instead
version="1.11.0", # don't change this manually, use bumpversion instead
license="MIT",
description="A Python framework for Ethereum smart contract deployment, testing and interaction.", # noqa: E501
long_description=long_description,
Expand Down

0 comments on commit b651552

Please sign in to comment.