From 647b56614ab709159f322e034b0fe31f98d40f9e Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 12 Jan 2011 17:21:11 +0100 Subject: [PATCH] fix issue17 by requiring an update to pylib which helps to fix it --- CHANGELOG | 3 ++- pytest.py | 2 +- setup.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ce507a89d..b697300cc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ 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 with python3 (now that nose-1.0 supports python3) - remove somewhat surprising "same-conftest" detection because diff --git a/pytest.py b/pytest.py index cfb48e5e7..377a512f3 100644 --- a/pytest.py +++ b/pytest.py @@ -1,7 +1,7 @@ """ unit and functional testing with Python. """ -__version__ = '2.0.1.dev6' +__version__ = '2.0.1.dev7' __all__ = ['main'] from _pytest.core import main, UsageError, _preloadplugins diff --git a/setup.py b/setup.py index 0b3a1426d..593a15c52 100644 --- a/setup.py +++ b/setup.py @@ -22,14 +22,14 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.0.1.dev6', + version='2.0.1.dev7', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others', author_email='holger at merlinux.eu', entry_points= make_entry_points(), - install_requires=['py>=1.4.0'], + install_requires=['py>1.4.0'], classifiers=['Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License',