diff --git a/CHANGELOG b/CHANGELOG index 80b93a01d..08e2f0c0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,8 @@ Changes between 1.3.4 and 2.0.0dev0 by default setup.cfg and tox.ini files are searched. The old ways (certain environment variables, dynamic conftest.py reading is removed). +- add a new "-q" option which decreases verbosity and prints a more + nose/unittest-style "dot" output. - fix issue126 - introduce py.test.set_trace() to trace execution via PDB during the running of tests even if capturing is ongoing. - fix issue123 - new "python -m py.test" invocation for py.test @@ -30,6 +32,7 @@ Changes between 1.3.4 and 2.0.0dev0 - fix bug: unittest collected functions now also can have "pytestmark" applied at class/module level + Changes between 1.3.3 and 1.3.4 ---------------------------------------------- diff --git a/pytest/__init__.py b/pytest/__init__.py index a535a9579..fb6ab2cbd 100644 --- a/pytest/__init__.py +++ b/pytest/__init__.py @@ -5,7 +5,7 @@ see http://pytest.org for documentation and details (c) Holger Krekel and others, 2004-2010 """ -__version__ = '2.0.0.dev11' +__version__ = '2.0.0.dev12' __all__ = ['config', 'cmdline'] diff --git a/setup.py b/setup.py index 47c913fec..8e0ab15cf 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.0.0.dev11', + version='2.0.0.dev12', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], @@ -66,4 +66,4 @@ def make_entry_points(): return {'console_scripts': l} if __name__ == '__main__': - main() + main() \ No newline at end of file