Skip to content

Commit

Permalink
Remove the transaction pin
Browse files Browse the repository at this point in the history
  • Loading branch information
drnextgis committed Jan 19, 2018
1 parent 9dc6fa4 commit b13686f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 11 deletions.
2 changes: 0 additions & 2 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ Changes

- Add support for Python 3.4 up to 3.6.

- Require transaction >= 1.6.0.


0.7.7 (2016-06-23)
------------------
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
install_requires=[
'setuptools',
'SQLAlchemy>=0.5.1',
'transaction>=1.6.0',
'transaction',
'zope.interface>=3.6.0',
],
extras_require={'test': tests_require},
Expand Down
29 changes: 21 additions & 8 deletions src/zope/sqlalchemy/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def b(s):
return s

import os
import pkg_resources
import re
import unittest
import transaction
Expand Down Expand Up @@ -153,6 +154,8 @@ def connect(dbapi_connection, connection_record):
test_one = sa.Table('test_one', bound_metadata1, sa.Column('id', sa.Integer, primary_key=True))
test_two = sa.Table('test_two', bound_metadata2, sa.Column('id', sa.Integer, primary_key=True))

transaction_version = pkg_resources.get_distribution('transaction').parsed_version


class TestOne(SimpleModel):
pass
Expand Down Expand Up @@ -339,10 +342,15 @@ def testTransactionJoining(self):
"Not joined transaction")
transaction.abort()
conn = Session().connection()
self.assertEqual(
[r for r in t._resources if isinstance(r, tx.SessionDataManager)],
[],
"Not joined transaction")
if transaction_version < pkg_resources.parse_version('1.6.0'):
self.assertTrue(
[r for r in t._resources if isinstance(r, tx.SessionDataManager)],
"Not joined transaction")
else:
self.assertEqual(
[r for r in t._resources if isinstance(r, tx.SessionDataManager)],
[],
"Not joined transaction")

def testTransactionJoiningUsingRegister(self):
transaction.abort() # clean slate
Expand All @@ -358,10 +366,15 @@ def testTransactionJoiningUsingRegister(self):
"Not joined transaction")
transaction.abort()
conn = EventSession().connection()
self.assertEqual(
[r for r in t._resources if isinstance(r, tx.SessionDataManager)],
[],
"Not joined transaction")
if transaction_version < pkg_resources.parse_version('1.6.0'):
self.assertTrue(
[r for r in t._resources if isinstance(r, tx.SessionDataManager)],
"Not joined transaction")
else:
self.assertEqual(
[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
Expand Down

0 comments on commit b13686f

Please sign in to comment.