diff --git a/CHANGELOG b/CHANGELOG index d97542f..ad2750a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,11 @@ +Release 0.10.4 +-------------- + - drop Python 2.6, 3.3 and Jython support - add Python 3.6 and 3.7 support - don't hide exception when flexmock is used as context manager - fix expectation reset for static methods on pypy 2 +- ensure original exception isn't suppressed in pytest hook Release 0.10.3 -------------- diff --git a/docs/conf.py b/docs/conf.py index 0302efb..cf58708 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,7 +51,7 @@ # built documents. # # The short X.Y version. -version = '0.10.3' +version = '0.10.4' # The full version, including alpha/beta/rc tags. release = version diff --git a/flexmock.py b/flexmock.py index c33b38e..3ca6553 100644 --- a/flexmock.py +++ b/flexmock.py @@ -25,7 +25,7 @@ # from flexmock import * is evil, keep it from doing any damage __all__ = ['flexmock'] -__version__ = '0.10.3' +__version__ = '0.10.4' import inspect diff --git a/setup.py b/setup.py index 9db5ec5..0769cff 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.core import setup setup(name='flexmock', - version='0.10.3', + version='0.10.4', author='Slavek Kabrda, Herman Sheremetyev', author_email='slavek@redhat.com', url='http://flexmock.readthedocs.org',