[Zodb-checkins] SVN: ZODB/trunk/s Pin transaction/manuel to Python 2.5-compat. versions under Python 2.5.

[Tres Seaver]

Log message for revision 125619:
  Pin transaction/manuel to Python 2.5-compat. versions under Python 2.5.
  

Changed:
  U   ZODB/trunk/setup.py
  U   ZODB/trunk/src/CHANGES.txt

-=-
Modified: ZODB/trunk/setup.py
===================================================================
--- ZODB/trunk/setup.py	2012-05-02 16:09:27 UTC (rev 125618)
+++ ZODB/trunk/setup.py	2012-05-02 16:27:10 UTC (rev 125619)
@@ -34,6 +34,14 @@
     print "This version of ZODB requires Python 2.5 or higher"
     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:
 # Development Status :: 5 - Production/Stable
 # Development Status :: 4 - Beta
@@ -190,10 +198,10 @@
       classifiers = filter(None, classifiers.split("\n")),
       long_description = long_description,
       test_suite="__main__.alltests", # to support "setup.py test"
-      tests_require = ['zope.testing', 'manuel'],
-      extras_require = dict(test=['zope.testing', 'manuel']),
+      tests_require = ['zope.testing', manuel_version],
+      extras_require = dict(test=['zope.testing', manuel_version]),
       install_requires = [
-        'transaction >=1.1.0',
+        transaction_version,
         'zc.lockfile',
         'ZConfig',
         'zdaemon',

Modified: ZODB/trunk/src/CHANGES.txt
===================================================================
--- ZODB/trunk/src/CHANGES.txt	2012-05-02 16:09:27 UTC (rev 125618)
+++ ZODB/trunk/src/CHANGES.txt	2012-05-02 16:27:10 UTC (rev 125619)
@@ -29,6 +29,12 @@
   dynamically determined server address from information in a
   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)
 ===================