p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump version, add a bit to changelog

This commit is contained in:
holger krekel 2010-10-31 19:53:11 +01:00
parent 8871ca5bfa
commit f1e3dde2ec
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -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 by default setup.cfg and tox.ini files are searched. The old
ways (certain environment variables, dynamic conftest.py reading ways (certain environment variables, dynamic conftest.py reading
is removed). 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 - fix issue126 - introduce py.test.set_trace() to trace execution via
PDB during the running of tests even if capturing is ongoing. PDB during the running of tests even if capturing is ongoing.
- fix issue123 - new "python -m py.test" invocation for py.test - 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" - fix bug: unittest collected functions now also can have "pytestmark"
applied at class/module level applied at class/module level
Changes between 1.3.3 and 1.3.4 Changes between 1.3.3 and 1.3.4
---------------------------------------------- ----------------------------------------------

2
pytest/__init__.py
View File

@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
(c) Holger Krekel and others, 2004-2010 (c) Holger Krekel and others, 2004-2010
""" """
__version__ = '2.0.0.dev11' __version__ = '2.0.0.dev12'
__all__ = ['config', 'cmdline'] __all__ = ['config', 'cmdline']

4
setup.py
View File

@ -22,7 +22,7 @@ def main():
name='pytest', name='pytest',
description='py.test: simple powerful testing with Python', description='py.test: simple powerful testing with Python',
long_description = long_description, long_description = long_description,
version='2.0.0.dev11', version='2.0.0.dev12',
url='http://pytest.org', url='http://pytest.org',
license='MIT license', license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@ -66,4 +66,4 @@ def make_entry_points():
return {'console_scripts': l} return {'console_scripts': l}
if __name__ == '__main__': if __name__ == '__main__':
main() main()