Commit cf2fe0ad authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch 'master' into y/loadAt.9

* master:
  - vb [ci skip]
  - force recognizing ellipsis
  - try to fix changed traceback representation
  - select more specific pypy versions
  - prepare release 5.7.0
  - revert 5b8e2dc1
parents daf82646 d445e007
......@@ -29,8 +29,8 @@ jobs:
- ["3.8", "py38"]
- ["3.9", "py39"]
- ["3.10", "py310"]
- ["pypy2", "pypy"]
- ["pypy3", "pypy3"]
- ["pypy-2.7", "pypy"]
- ["pypy-3.7", "pypy3"]
- ["3.9", "docs"]
- ["3.9", "coverage"]
- ["3.8", "py38-pure"]
......@@ -38,7 +38,7 @@ jobs:
- { os: windows, config: ["3.9", "lint"] }
- { os: windows, config: ["3.9", "docs"] }
- { os: windows, config: ["3.9", "coverage"] }
- { os: windows, config: ["pypy2", "pypy"] }
- { os: windows, config: ["pypy-2.7", "pypy"] }
runs-on: ${{ matrix.os }}-latest
name: ${{ matrix.os }}-${{ matrix.config[1] }}
......
......@@ -2,7 +2,7 @@
Change History
================
5.7.0 (unreleased)
5.7.1 (unreleased)
==================
- Introduce a new ``loadBeforeEx`` interface that complements ``loadBefore``:
......@@ -14,7 +14,12 @@
and `PR 323 <https://github.com/zopefoundation/ZODB/pull/323>`_
for details.
- Fix ``TypeError: can't concat str to bytes`` when running fsoids.py script with Python 3.
5.7.0 (2022-03-17)
==================
- Fix ``TypeError: can't concat str to bytes`` when running fsoids.py script
with Python 3.
See `issue 350 <https://github.com/zopefoundation/ZODB/issues/350>`_.
- Readd transaction size information to ``fsdump`` output;
......@@ -26,8 +31,8 @@
- Fix UnboundLocalError when running fsoids.py script.
See `issue 285 <https://github.com/zopefoundation/ZODB/issues/285>`_.
- Rework ``fsrefs`` script to work significantly faster by optimizing how it does
IO. See `PR 340 <https://github.com/zopefoundation/ZODB/pull/340>`_.
- Rework ``fsrefs`` script to work significantly faster by optimizing how it
does IO. See `PR 340 <https://github.com/zopefoundation/ZODB/pull/340>`_.
- Require Python 3 to build the documentation.
......
Sphinx
# Silence dependabot claiming a security issue in older versions:
pygments >= 2.7.4 ; python_version >= '3'
# pygments 2.6 stopped supporting py2
pygments < 2.6 ; python_version < '3'
pygments >= 2.7.4
docutils
ZODB
sphinxcontrib_zopeext
......
......@@ -13,7 +13,7 @@
##############################################################################
from setuptools import setup, find_packages
version = '5.7.0.dev0'
version = '5.7.1.dev0'
classifiers = """\
Intended Audience :: Developers
......
......@@ -123,7 +123,7 @@ Then the class will return to it's prior state:
>>> c.baz()
Traceback (most recent call last):
...
AttributeError: 'C' object has no attribute 'baz'
AttributeError: 'C' object has no attribute 'baz'...
>>> c.bar()
bar first
......@@ -168,7 +168,7 @@ Similarly, we don't see changes made in other connections:
>>> c.color
Traceback (most recent call last):
...
AttributeError: 'C' object has no attribute 'color'
AttributeError: 'C' object has no attribute 'color'...
until we sync:
......
......@@ -95,6 +95,7 @@ def test_suite():
doctest.DocFileSuite(
"../persistentclass.rst",
setUp=setUp, tearDown=tearDown,
checker=ZODB.tests.util.checker),
checker=ZODB.tests.util.checker,
optionflags=doctest.ELLIPSIS),
doctest.DocTestSuite(setUp=setUp, tearDown=tearDown),
))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment