Skip to content

Commit

Permalink
Use new transaction release to get the fix for zopefoundation/ZODB#208.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Oct 24, 2018
1 parent 950a785 commit 19d3d07
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGES.rst
Expand Up @@ -28,6 +28,10 @@ Bugfixes
stdlib in Python 3.
(`#368 <https://github.com/zopefoundation/Zope/issues/368>`_)

- Fix KeyError on releasing resources of a Connection when closing the DB.
This requires at least version 2.4 of the `transaction` package.
See `issue 208 <https://github.com/zopefoundation/ZODB/issues/208>`.

- Fix rendering of ordered folder icon in ZMI.

Other changes
Expand Down
2 changes: 1 addition & 1 deletion constraints.txt
Expand Up @@ -34,7 +34,7 @@ persistent==4.4.3
pytz==2018.5
shutilwhich==1.1.0
six==1.11.0
transaction==2.3.0
transaction==2.4.0
waitress==1.1.0
z3c.pt==3.1.0
zExceptions==4.1
Expand Down
2 changes: 1 addition & 1 deletion requirements-full.txt
Expand Up @@ -34,7 +34,7 @@ persistent==4.4.3
pytz==2018.5
shutilwhich==1.1.0
six==1.11.0
transaction==2.3.0
transaction==2.4.0
waitress==1.1.0
z3c.pt==3.1.0
zExceptions==4.1
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -78,7 +78,7 @@ def _read_file(filename):
'ipaddress ; python_version=="2.7"',
'setuptools >= 36.2',
'six',
'transaction',
'transaction >= 2.4',
'waitress',
'zExceptions >= 3.4',
'z3c.pt',
Expand Down
4 changes: 2 additions & 2 deletions src/ZPublisher/tests/test_WSGIPublisher.py
Expand Up @@ -615,11 +615,11 @@ def counts(self):
transaction.manager.registerSynch(counter)

transaction.begin()
self.assertIsNotNone(transaction.manager._txn)
self.assertIsNotNone(transaction.manager.manager._txn)
with load_app(self._makeModuleInfo()):
transaction.abort()

self.assertIsNone(transaction.manager._txn)
self.assertIsNone(transaction.manager.manager._txn)
self.assertEqual(counter.counts(), (1, 1))


Expand Down
2 changes: 1 addition & 1 deletion versions-prod.cfg
Expand Up @@ -32,7 +32,7 @@ Record = 3.5
RestrictedPython = 4.0b6
shutilwhich = 1.1.0
six = 1.11.0
transaction = 2.3.0
transaction = 2.4.0
waitress = 1.1.0
WebOb = 1.8.3
WebTest = 2.0.32
Expand Down

0 comments on commit 19d3d07

Please sign in to comment.