diff --git a/CHANGELOG b/CHANGELOG index c0a14427f..043ba4566 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Changes between 2.3.1 and 2.3.2.dev ----------------------------------- +- fix issue208 and fix issue29 use new py version to avoid long pauses + when printing tracebacks in long modules + - fix issue205 - conftests in subdirs customizing pytest_pycollect_makemodule and pytest_pycollect_makeitem now work properly diff --git a/setup.py b/setup.py index 67f497d28..c8d70d29c 100644 --- a/setup.py +++ b/setup.py @@ -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.10'], + install_requires=['py>=1.4.11.dev6'], classifiers=['Development Status :: 6 - Mature', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', diff --git a/tox.ini b/tox.ini index 00b38f76b..3844f8262 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ envlist=py26,py27,py27-nobyte,py31,py32,py33,py27-xdist,py25,trial indexserver= pypi = http://pypi.python.org/simple testrun = http://pypi.testrun.org - #default = http://pypi.testrun.org + default = http://pypi.testrun.org [testenv] changedir=testing @@ -84,7 +84,7 @@ deps=py>=1.4.0 [testenv:py33] deps=py>=1.4.0 - nose + :pypi:nose [testenv:jython] changedir=testing