Merge branch 'master' into py310 [ci skip]

.github/workflows/tests.yml

@@ -17,23 +17,16 @@ jobs:
         - ["2.7",   "py27-msgpack1"]
         - ["2.7",   "py27-zeo4"]
         - ["2.7",   "py27-zodbmaster"]
-        - ["3.5",   "py35"]
-        - ["3.5",   "py35-zeo4"]
         - ["3.6",   "py36"]
-        - ["3.6",   "py36-mtacceptor"]
-        - ["3.6",   "py36-mtacceptor-msgpack1"]
         - ["3.7",   "py37"]
-        - ["3.7",   "py37-mtacceptor"]
-        - ["3.7",   "py37-mtacceptor-msgpack1"]
+        - ["3.7",   "py37-msgpack1"]
         - ["3.7",   "py37-uvloop"]
         - ["3.7",   "py37-zodbmaster"]
         - ["3.8",   "py38"]
-        - ["3.8",   "py38-mtacceptor"]
-        - ["3.8",   "py38-mtacceptor-msgpack1"]
+        - ["3.8",   "py38-msgpack1"]
         - ["3.8",   "py38-uvloop"]
         - ["3.9",   "py39"]
-        - ["3.9",   "py39-mtacceptor"]
-        - ["3.9",   "py39-mtacceptor-msgpack1"]
+        - ["3.9",   "py39-msgpack1"]
         - ["3.9",   "py39-uvloop"]
         - ["3.10",  "py310"]
         - ["3.10",  "py310-mtacceptor"]
@@ -41,8 +34,7 @@ jobs:
         - ["3.10",  "py310-uvloop"]
         - ["pypy2", "pypy"]
         - ["pypy3", "pypy3"]
-        - ["pypy3", "pypy3-mtacceptor"]
-        - ["pypy3", "pypy3-mtacceptor-msgpack1"]
+        - ["pypy3", "pypy3-msgpack1"]
 
     runs-on: ubuntu-latest
     name: ${{ matrix.config[1] }}

CHANGES.rst

 Changelog
 =========
 
-5.3.0 (unreleased)
+5.4.0 (unreleased)
 ------------------
 
-- Add support for Python 3.8, 3.9 and 3.10.
+- Add support for Python 3.10.
+
+
+5.3.0 (2022-03-24)
+------------------
+
+- Remove tests for the `asyncio/mtacceptor` module, it appears unused
+  and presents a maintenance burden. The module will be removed in
+  ZEO version 6.
+
+- Remove GitHub Actions testing for Python 3.5, it has reached end of life.
+
+- Add support for Python 3.8 and Python 3.9.
 
 - Add more accurate error handling for ``asyncio.CancelledError``.
   See `issue 165 <https://github.com/zopefoundation/ZEO/issues/165>`_.

MANIFEST.in

@@ -3,7 +3,6 @@ include *.txt
 include *.py
 include buildout.cfg
 include tox.ini
-include .travis.yml
 include COPYING
 include log.ini
 

setup.py

@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-version = '5.3.0.dev0'
+version = '5.3.1.dev0'
 
 from setuptools import setup, find_packages
 import os

src/ZEO/StorageServer.py

@@ -48,7 +48,10 @@ from ZODB.POSException import TransactionError, ReadOnlyError, ConflictError
 from ZODB.serialize import referencesf
 from ZODB.utils import oid_repr, p64, u64, z64, Lock, RLock
 
+# BBB mtacceptor is unused and will be removed in ZEO version 6
 if os.environ.get("ZEO_MTACCEPTOR"): # mainly for tests
+    warnings.warn('The mtacceptor module is deprecated and will be removed '
+                  'in ZEO version 6.', DeprecationWarning)
     from .asyncio.mtacceptor import Acceptor
 else:
     from .asyncio.server import Acceptor

src/ZEO/asyncio/mtacceptor.py

@@ -13,6 +13,8 @@
 ##############################################################################
 """Multi-threaded server connectin acceptor
 
+BBB this module is unused and will be removed in ZEO version 6
+
 Each connection is run in it's own thread. Testing serveral years ago
 suggsted that this was a win, but ZODB shootout and another
 lower-level tests suggest otherwise.  It's really unclear, which is

tox.ini

@@ -39,7 +39,6 @@ deps =
 setenv =
     !py27-!pypy: PYTHONWARNINGS=ignore::ResourceWarning
     msgpack1: ZEO_MSGPACK=1
-    mtacceptor: ZEO_MTACCEPTOR=1
     zeo4: ZEO4_SERVER=1
 
 [testenv:simple]