[Zodb-checkins] SVN: ZODB/branches/3.10/s Pin transaction to a 2.5-compatible version when installed under 2.5.

[Tres Seaver]

Log message for revision 125617:
  Pin transaction to a 2.5-compatible version when installed under 2.5.

Changed:
  U   ZODB/branches/3.10/setup.py
  U   ZODB/branches/3.10/src/CHANGES.txt

-=-
Modified: ZODB/branches/3.10/setup.py
===================================================================
--- ZODB/branches/3.10/setup.py	2012-05-02 12:28:55 UTC (rev 125616)
+++ ZODB/branches/3.10/setup.py	2012-05-02 15:59:25 UTC (rev 125617)
@@ -34,6 +34,11 @@
     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'
+else:
+    transaction_version = 'transaction >= 1.1.0'
+
 # The (non-obvious!) choices for the Trove Development Status line:
 # Development Status :: 5 - Production/Stable
 # Development Status :: 4 - Beta
@@ -193,7 +198,7 @@
       tests_require = ['zope.testing', 'manuel'],
       extras_require = dict(test=['zope.testing', 'manuel']),
       install_requires = [
-        'transaction >=1.1.0',
+        transaction_version,
         'zc.lockfile',
         'ZConfig',
         'zdaemon',

Modified: ZODB/branches/3.10/src/CHANGES.txt
===================================================================
--- ZODB/branches/3.10/src/CHANGES.txt	2012-05-02 12:28:55 UTC (rev 125616)
+++ ZODB/branches/3.10/src/CHANGES.txt	2012-05-02 15:59:25 UTC (rev 125617)
@@ -2,6 +2,15 @@
  Change History
 ================
 
+3.10.6 (unreleased)
+===================
+
+Bugs Fixed
+----------
+
+- Pinned the ``transaction`` dependency to a Python 2.5-compatible version
+  when installing under Python 2.5.
+
 3.10.5 (2011-11-19)
 ===================