Commit c0c6c6c3 authored by Tres Seaver's avatar Tres Seaver

Pin transaction/manuel to Python 2.5-compat. versions under Python 2.5.

parent a5bfada9
...@@ -34,6 +34,14 @@ if sys.version_info < (2, 5): ...@@ -34,6 +34,14 @@ if sys.version_info < (2, 5):
print "This version of ZODB requires Python 2.5 or higher" print "This version of ZODB requires Python 2.5 or higher"
sys.exit(0) sys.exit(0)
if sys.version_info < (2, 6):
transaction_version = 'transaction == 1.1.1'
manuel_version = 'manuel < 1.6dev'
else:
transaction_version = 'transaction >= 1.1.0'
manuel_version = 'manuel'
# The (non-obvious!) choices for the Trove Development Status line: # The (non-obvious!) choices for the Trove Development Status line:
# Development Status :: 5 - Production/Stable # Development Status :: 5 - Production/Stable
# Development Status :: 4 - Beta # Development Status :: 4 - Beta
...@@ -190,10 +198,10 @@ setup(name="ZODB3", ...@@ -190,10 +198,10 @@ setup(name="ZODB3",
classifiers = filter(None, classifiers.split("\n")), classifiers = filter(None, classifiers.split("\n")),
long_description = long_description, long_description = long_description,
test_suite="__main__.alltests", # to support "setup.py test" test_suite="__main__.alltests", # to support "setup.py test"
tests_require = ['zope.testing', 'manuel'], tests_require = ['zope.testing', manuel_version],
extras_require = dict(test=['zope.testing', 'manuel']), extras_require = dict(test=['zope.testing', manuel_version]),
install_requires = [ install_requires = [
'transaction >=1.1.0', transaction_version,
'zc.lockfile', 'zc.lockfile',
'ZConfig', 'ZConfig',
'zdaemon', 'zdaemon',
......
...@@ -29,6 +29,12 @@ New Features ...@@ -29,6 +29,12 @@ New Features
dynamically determined server address from information in a dynamically determined server address from information in a
ZooKeeper database. ZooKeeper database.
Bugs Fixed
----------
- Pinned the ``transaction`` and ``manuel`` dependencies to Python 2.5-
compatible versions when installing under Python 2.5.
3.10.5 (2011-11-19) 3.10.5 (2011-11-19)
=================== ===================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment