Merge branch 'master' into chameleon-460

Author: dataflake

constraints.txt

@@ -1,6 +1,7 @@
 AccessControl==7.2
 Acquisition==6.1
-AuthEncoding==5.0
+AuthEncoding==5.0; python_version == '3.8'
+AuthEncoding==6.0; python_version > '3.8'
 BTrees==6.1
 Babel==2.16.0
 Chameleon==4.4.4; python_version == '3.8'

requirements-full.txt

@@ -1,7 +1,8 @@
 -e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope
 AccessControl==7.2
 Acquisition==6.1
-AuthEncoding==5.0
+AuthEncoding==5.0; python_version == '3.8'
+AuthEncoding==6.0; python_version > '3.8'
 BTrees==6.1
 Chameleon==4.4.4; python_version == '3.8'
 Chameleon==4.6.0; python_version > '3.8'

versions-prod.cfg

@@ -6,7 +6,7 @@ Zope =
 Zope2 = 4.0
 AccessControl = 7.2
 Acquisition = 6.1
-AuthEncoding = 5.0
+AuthEncoding = 6.0
 BTrees = 6.1
 Chameleon = 4.6.0
 DateTime = 5.5
@@ -83,6 +83,8 @@ zope.traversing = 5.0
 zope.viewlet = 5.0
 
 [versions:python38]
+# AuthEncoding >= 6 requires Python 3.9
+AuthEncoding = 5.0
 # Chameleon >= 4.5 requires Python 3.9
 Chameleon = 4.4.4
 # waitress >= 3.0.1 requires Python 3.9