diff --git a/.gitignore b/.gitignore index cdc12a92c..00b572813 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ env/ .mypy_cache/ .idea/ .DS_Store +.hypothesis/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 98a2cd9aa..b33ff0ea4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/iamdefinitelyahuman/brownie) +## [1.5.1](https://github.com/iamdefinitelyahuman/brownie/tree/v1.5.1) - 2020-01-21 ### Fixed - Correctly isolate path and nodeid from test cases inside classes - Allow `""` and `"0x"` when converting to bytes, disallow booleans +- Tests can run from inside a project subfolder +- Preserve pytest `rootdir` when a Brownie project is in a subfolder of a Python project ## [1.5.0](https://github.com/iamdefinitelyahuman/brownie/tree/v1.5.0) - 2020-01-20 ### Added diff --git a/brownie/_cli/__main__.py b/brownie/_cli/__main__.py index 10adfb865..7104d7cb0 100644 --- a/brownie/_cli/__main__.py +++ b/brownie/_cli/__main__.py @@ -11,7 +11,7 @@ from brownie.exceptions import ProjectNotFound from brownie.utils import color, notify -__version__ = "1.5.0" +__version__ = "1.5.1" __doc__ = """Usage: brownie [...] [options ] diff --git a/docs/conf.py b/docs/conf.py index 51a909485..2a69a8696 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -37,7 +37,7 @@ def setup(sphinx): # The short X.Y version version = "" # The full version, including alpha/beta/rc tags -release = "v1.5.0" +release = "v1.5.1" # -- General configuration --------------------------------------------------- diff --git a/setup.cfg b/setup.cfg index a36923d4d..45720725d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.0 +current_version = 1.5.1 [bumpversion:file:setup.py] diff --git a/setup.py b/setup.py index ffbefb4cf..204d6d970 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ setup( name="eth-brownie", packages=find_packages(), - version="1.5.0", # don't change this manually, use bumpversion instead + version="1.5.1", # 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,