diff --git a/AUTHORS b/AUTHORS index 8dfc8e58e..0ac43650a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -30,3 +30,4 @@ Christian Tismer Daniel Nuri Graham Horler Andreas Zeidler +Brian Okken diff --git a/CHANGELOG b/CHANGELOG index ccffa39cb..155f6fffa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Changes between 2.3.5 and 2.4.DEV ----------------------------------- +- add support for setUpModule/tearDownModule detection, thanks Brian Okken. + - make sessionfinish hooks execute with the same cwd-context as at session start (helps fix plugin behaviour which write output files with relative path such as pytest-cov) diff --git a/_pytest/__init__.py b/_pytest/__init__.py index a5d89a853..654c9a59a 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.4.0.dev3' +__version__ = '2.4.0.dev4' diff --git a/setup.py b/setup.py index 538d267ce..d8b32746b 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.4.0.dev3', + version='2.4.0.dev4', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],