diff --git a/CHANGELOG b/CHANGELOG index 4d7dae038..1dd4bae37 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,7 @@ Changes between 2.3.2 and 2.3.3.dev - fix issue214 - parse modules that contain special objects like e. g. flask's request object which blows up on getattr access if no request - is active. + is active. thanks Thomas Waldmann. - fix issue213 - allow to parametrize with values like numpy arrays that do not support an __eq__ operator @@ -11,15 +11,18 @@ Changes between 2.3.2 and 2.3.3.dev - fix issue215 - split test_python.org into multiple files - fix issue148 - @unittest.skip on classes is now recognized and avoids - calling setUpClass/tearDownClass + calling setUpClass/tearDownClass, thanks Pavel Repin - fix issue209 - reintroduce python2.4 support by depending on newer pylib which re-introduced statement-finding for pre-AST interpreters -- nose support: only call setup, if its a callable +- nose support: only call setup if its a callable, thanks Andrew + Taumoefolau - fix issue219 - add py2.4-3.3 classifiers to TROVE list +- in tracebacks *,** arg values are now shown next to normal arguments + (thanks Manuel Jacob) Changes between 2.3.1 and 2.3.2 ----------------------------------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 2c503ccd2..d17a859f7 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.3.3.dev2' +__version__ = '2.3.3.dev3' diff --git a/setup.py b/setup.py index ecdaed129..8082f93d0 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.3.3.dev2', + version='2.3.3.dev3', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], @@ -33,7 +33,7 @@ def main(): entry_points= make_entry_points(), cmdclass = {'test': PyTest}, # the following should be enabled for release - install_requires=['py>=1.4.12.dev1'], + install_requires=['py>=1.4.12.dev2'], classifiers=['Development Status :: 6 - Mature', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License',