Merge 2d0ae71 into 8f5ac63

zopefoundation · Aug 22, 2018 · 435031f · 435031f
2 parents 8f5ac63 + 2d0ae71
commit 435031f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,13 +2,14 @@
  Change History
 ================
 
-5.4.1 (unreleased)
+5.5.0 (unreleased)
 ==================
 
 - Bump the dependency on zodbpickle to at least 1.0.1. This is
   required to avoid a memory leak on Python 2.7. See `issue 203
   <https://github.com/zopefoundation/ZODB/issues/203>`_.
 
+- Bump the dependency on persistent to at least 4.4.0.
 
 5.4.0 (2018-03-26)
 ==================

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 import os
 from setuptools import setup, find_packages
 
-version = '5.4.1.dev0'
+version = '5.5.0.dev0'
 
 classifiers = """\
 Intended Audience :: Developers
@@ -125,7 +125,7 @@ def read(path):
         'test': tests_require,
     },
     install_requires=[
-        'persistent >= 4.2.0',
+        'persistent >= 4.4.0',
         'BTrees >= 4.2.0',
         'ZConfig',
         'transaction >= 2.0.3',

diff --git a/src/ZODB/tests/util.py b/src/ZODB/tests/util.py
@@ -37,6 +37,11 @@
      r"\1"),
     (re.compile('b(".*?")'),
      r"\1"),
+    # Persistent 4.4 changes the repr of persistent subclasses,
+    # and it is slightly different with the C extension and
+    # pure-Python module
+    (re.compile('ZODB.tests.testcrossdatabasereferences.'),
+     ''),
     # Python 3 adds module name to exceptions.
     (re.compile("ZODB.interfaces.BlobError"),
      r"BlobError"),