diff --git a/CHANGELOG b/CHANGELOG index 8470e9afd..6a65bf69e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,10 @@ Changes between 2.3.2 and 2.3.3.dev - fix issue148 - @unittest.skip on classes is now recognized and avoids calling setUpClass/tearDownClass +- fix issue209 - reintroduce python2.4 support by depending on newer + pylib which re-introduced statement-finding for pre-AST interpreters + + Changes between 2.3.1 and 2.3.2 ----------------------------------- diff --git a/setup.py b/setup.py index 1008aa0ae..b127ed045 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.11'], + install_requires=['py>=1.4.12.dev1'], classifiers=['Development Status :: 6 - Mature', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', diff --git a/tox.ini b/tox.ini index 4aff5c117..b3196fd1e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] distshare={homedir}/.tox/distshare -envlist=py26,py27,py27-nobyte,py31,py32,py33,py27-xdist,py25,trial +envlist=py24,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