Merge pull request #25 from drnextgis/transaction

Support transaction>=1.6.0
zopefoundation · Jan 26, 2018 · 378ac59 · 378ac59
2 parents 348fd5e + 58ec8b0
commit 378ac59
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -8,7 +8,7 @@ Changes
 
 - Add support for Python 3.4 up to 3.6.
 
-- *Attention:* This versions currently does not support ``transaction >= 1.5``. (See https://github.com/zopefoundation/zope.sqlalchemy/issues/20)
+- Drop support for transaction < 1.6.0.
 
 
 0.7.7 (2016-06-23)

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
     install_requires=[
         'setuptools',
         'SQLAlchemy>=0.5.1',
-        'transaction < 1.5',
+        'transaction>=1.6.0',
         'zope.interface>=3.6.0',
     ],
     extras_require={'test': tests_require},

diff --git a/src/zope/sqlalchemy/tests.py b/src/zope/sqlalchemy/tests.py
@@ -337,11 +337,6 @@ def testTransactionJoining(self):
         self.assertTrue(
             [r for r in t._resources if isinstance(r, tx.SessionDataManager)],
             "Not joined transaction")
-        transaction.abort()
-        conn = Session().connection()
-        self.assertTrue(
-            [r for r in t._resources if isinstance(r, tx.SessionDataManager)],
-            "Not joined transaction")
 
     def testTransactionJoiningUsingRegister(self):
         transaction.abort()  # clean slate
@@ -355,11 +350,6 @@ def testTransactionJoiningUsingRegister(self):
         self.assertTrue(
             [r for r in t._resources if isinstance(r, tx.SessionDataManager)],
             "Not joined transaction")
-        transaction.abort()
-        conn = EventSession().connection()
-        self.assertTrue(
-            [r for r in t._resources if isinstance(r, tx.SessionDataManager)],
-            "Not joined transaction")
 
     def testSavepoint(self):
         use_savepoint = not engine.url.drivername in tx.NO_SAVEPOINT_SUPPORT