jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issue17 by requiring an update to pylib which helps to fix it

This commit is contained in:
holger krekel 2011-01-12 17:21:11 +01:00
parent 1b3fb3d229
commit 647b56614a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,6 +1,7 @@
Changes between 2.0.0 and 2.0.1.devX Changes between 2.0.0 and 2.0.1.devX
---------------------------------------------- ----------------------------------------------
- fix issue17 (import-* reporting issue on python3) by
requiring py>1.4.0 (1.4.1 is going to include it)
- fix issue15: make nose compatibility tests compatible - fix issue15: make nose compatibility tests compatible
with python3 (now that nose-1.0 supports python3) with python3 (now that nose-1.0 supports python3)
- remove somewhat surprising "same-conftest" detection because - remove somewhat surprising "same-conftest" detection because

2
pytest.py
View File

@ -1,7 +1,7 @@
""" """
unit and functional testing with Python. unit and functional testing with Python.
""" """
__version__ = '2.0.1.dev6' __version__ = '2.0.1.dev7'
__all__ = ['main'] __all__ = ['main']
from _pytest.core import main, UsageError, _preloadplugins from _pytest.core import main, UsageError, _preloadplugins

4
setup.py
View File

@ -22,14 +22,14 @@ 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.1.dev6', version='2.0.1.dev7',
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'],
author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others', author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',
author_email='holger at merlinux.eu', author_email='holger at merlinux.eu',
entry_points= make_entry_points(), entry_points= make_entry_points(),
install_requires=['py>=1.4.0'], install_requires=['py>1.4.0'],
classifiers=['Development Status :: 5 - Production/Stable', classifiers=['Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',