Merge branch 'master' into icemac-patch-1

CHANGES.rst

@@ -16,6 +16,13 @@ https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
 
 - Resurrect History ZMI tab and functionality
 
+- Removed commented out configuration for tempstorage (and server side 
+  sessions) as that was known not working for ages. This was removed so we do 
+  not lead unsuspecting developers to think that this is the right way to do 
+  session data. See
+  (`#679 <https://github.com/zopefoundation/Zope/issues/679>`_)
+  (`tempstorage#8 <https://github.com/zopefoundation/tempstorage/issues/8>`_)
+  (`tempstorage#12 <https://github.com/zopefoundation/tempstorage/issues/12>`_)
 
 4.1.1 (2019-07-02)
 ------------------

buildout.cfg

@@ -20,6 +20,7 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
+    AccessControl
 
 [testenv]
 PYTHONHASHSEED = random

constraints.txt

@@ -1,14 +1,14 @@
 AccessControl==4.0
 Acquisition==4.6
 AuthEncoding==4.1
-BTrees==4.5.1
+BTrees==4.6.0
 Chameleon==3.6.2
 DateTime==4.3
 DocumentTemplate==3.1b2
 ExtensionClass==4.4
 Missing==4.1
 MultiMapping==4.1
-Paste==3.0.8
+Paste==3.1.0
 PasteDeploy==2.0.1
 Persistence==3.0
 Products.BTreeFolder2==4.2
@@ -29,9 +29,9 @@ funcsigs==1.0.2
 future==0.17.1
 ipaddress==1.0.22
 mock==3.0.5
-pbr==5.3.1
+pbr==5.4.2
 persistent==4.5.0
-pytz==2019.1
+pytz==2019.2
 roman==3.2
 shutilwhich==1.1.0
 six==1.12.0
@@ -55,7 +55,7 @@ zope.container==4.2.2
 zope.contentprovider==4.2.1
 zope.contenttype==4.4
 zope.datetime==4.2.0
-zope.deferredimport==4.3
+zope.deferredimport==4.3.1
 zope.deprecation==4.4.0
 zope.dottedname==4.3
 zope.event==4.4
@@ -64,16 +64,16 @@ zope.filerepresentation==4.2.0
 zope.formlib==4.6.0
 zope.globalrequest==1.5
 zope.hookable==4.2.0
-zope.i18n==4.6.2
+zope.i18n==4.7.0
 zope.i18nmessageid==4.3.1
 zope.interface==4.6.0
 zope.lifecycleevent==4.3.0
 zope.location==4.2
 zope.pagetemplate==4.4.1
 zope.processlifetime==2.3.0
-zope.proxy==4.3.1
+zope.proxy==4.3.2
 zope.ptresource==4.2.0
-zope.publisher==5.0.1
+zope.publisher==5.1.0
 zope.ramcache==2.3
 zope.schema==4.9.3
 zope.security==4.3.1

docs/zope4/news.rst

@@ -29,7 +29,7 @@ found in this release.
 
 Extended Python version support
 -------------------------------
-Zope 4 supports Python 2.7 and Python 3.5 and higher.
+Zope 4 supports Python 2.7 and Python 3.5 up to Python 3.8.
 
 The Python 3 support currently covers the core dependencies shipped
 with Zope and is limited to the new WSGI based publisher. The new

requirements-full.txt

@@ -2,14 +2,14 @@
 AccessControl==4.0
 Acquisition==4.6
 AuthEncoding==4.1
-BTrees==4.5.1
+BTrees==4.6.0
 Chameleon==3.6.2
 DateTime==4.3
 DocumentTemplate==3.1b2
 ExtensionClass==4.4
 Missing==4.1
 MultiMapping==4.1
-Paste==3.0.8
+Paste==3.1.0
 PasteDeploy==2.0.1
 Persistence==3.0
 Products.BTreeFolder2==4.2
@@ -29,9 +29,9 @@ funcsigs==1.0.2
 future==0.17.1
 ipaddress==1.0.22
 mock==3.0.5
-pbr==5.3.1
+pbr==5.4.2
 persistent==4.5.0
-pytz==2019.1
+pytz==2019.2
 roman==3.2
 shutilwhich==1.1.0
 six==1.12.0
@@ -55,7 +55,7 @@ zope.container==4.2.2
 zope.contentprovider==4.2.1
 zope.contenttype==4.4
 zope.datetime==4.2.0
-zope.deferredimport==4.3
+zope.deferredimport==4.3.1
 zope.deprecation==4.4.0
 zope.dottedname==4.3
 zope.event==4.4
@@ -64,16 +64,16 @@ zope.filerepresentation==4.2.0
 zope.formlib==4.6.0
 zope.globalrequest==1.5
 zope.hookable==4.2.0
-zope.i18n==4.6.2
+zope.i18n==4.7.0
 zope.i18nmessageid==4.3.1
 zope.interface==4.6.0
 zope.lifecycleevent==4.3.0
 zope.location==4.2
 zope.pagetemplate==4.4.1
 zope.processlifetime==2.3.0
-zope.proxy==4.3.1
+zope.proxy==4.3.2
 zope.ptresource==4.2.0
-zope.publisher==5.0.1
+zope.publisher==5.1.0
 zope.ramcache==2.3
 zope.schema==4.9.3
 zope.security==4.3.1

setup.py

@@ -131,7 +131,6 @@ def _read_file(filename):
             'Sphinx',
             'sphinx_rtd_theme',
             'repoze.sphinx.autointerface',
-            'tempstorage',
         ],
     },
     entry_points={

src/App/dtml/manage_navbar.dtml

@@ -10,7 +10,7 @@
     <i class="fa fa-bars"></i>
   </div>
   <a class="navbar-brand" title="To Zope Root" href="/manage" target="_parent">
-    <span class="product">ZOPE 4.0</span>
+    <span class="product">ZOPE 4</span>
   </a>
   <ul class="navbar-nav flex-row ml-sm-auto d-flex">
 

src/Zope2/utilities/skel/etc/zope.conf.in

@@ -9,16 +9,6 @@ instancehome $INSTANCE
    mount-point /
 </zodb_db>
 
-# Uncomment this if you use Products.Sessions and Products.TemporaryFolder
-# <zodb_db temporary>
-#     <temporarystorage>
-#       name Temporary database (for sessions)
-#     </temporarystorage>
-#     mount-point /temp_folder
-#     container-class Products.TemporaryFolder.TemporaryContainer
-# </zodb_db>
-
-
 # Directive: locale
 #
 # Description:

versions-prod.cfg

@@ -7,14 +7,14 @@ Zope2 = 4.0
 AccessControl = 4.0
 Acquisition = 4.6
 AuthEncoding = 4.1
-BTrees = 4.5.1
+BTrees = 4.6.0
 Chameleon = 3.6.2
 DateTime = 4.3
 DocumentTemplate = 3.1b2
 ExtensionClass = 4.4
 Missing = 4.1
 MultiMapping = 4.1
-Paste = 3.0.8
+Paste = 3.1.0
 PasteDeploy = 2.0.1
 Persistence = 3.0
 Products.BTreeFolder2 = 4.2
@@ -34,9 +34,9 @@ funcsigs = 1.0.2
 future = 0.17.1
 ipaddress = 1.0.22
 mock = 3.0.5
-pbr = 5.3.1
+pbr = 5.4.2
 persistent = 4.5.0
-pytz = 2019.1
+pytz = 2019.2
 roman = 3.2
 shutilwhich = 1.1.0
 six = 1.12.0
@@ -60,7 +60,7 @@ zope.container = 4.2.2
 zope.contentprovider = 4.2.1
 zope.contenttype = 4.4
 zope.datetime = 4.2.0
-zope.deferredimport = 4.3
+zope.deferredimport = 4.3.1
 zope.deprecation = 4.4.0
 zope.dottedname = 4.3
 zope.event = 4.4
@@ -69,16 +69,16 @@ zope.filerepresentation = 4.2.0
 zope.formlib = 4.6.0
 zope.globalrequest = 1.5
 zope.hookable = 4.2.0
-zope.i18n = 4.6.2
+zope.i18n = 4.7.0
 zope.i18nmessageid = 4.3.1
 zope.interface = 4.6.0
 zope.lifecycleevent = 4.3.0
 zope.location = 4.2
 zope.pagetemplate = 4.4.1
 zope.processlifetime = 2.3.0
-zope.proxy = 4.3.1
+zope.proxy = 4.3.2
 zope.ptresource = 4.2.0
-zope.publisher = 5.0.1
+zope.publisher = 5.1.0
 zope.ramcache = 2.3
 zope.schema = 4.9.3
 zope.security = 4.3.1

versions.cfg

@@ -8,14 +8,14 @@ versions = versions
 Babel = 2.7.0
 Jinja2 = 2.10.1
 MarkupSafe = 1.1.1
-Paste = 3.0.8
 Pygments = 2.4.2
 # Version 2.0+ needs Python 3.x
 Sphinx = 1.8.5
 alabaster = 0.7.12
 appdirs = 1.4.3
+attrs = 19.1.0
 backports.functools-lru-cache = 1.5
-beautifulsoup4 = 4.7.1
+beautifulsoup4 = 4.8.0
 bleach = 3.1.0
 buildout.wheel = 0.2.0
 certifi = 2019.6.16
@@ -26,46 +26,49 @@ collective.recipe.cmd = 0.11
 collective.recipe.sphinxbuilder = 1.1
 collective.recipe.template = 2.1
 colorama = 0.4.1
-coverage = 4.5.3
-docutils = 0.14
+configparser = 3.7.4
+contextlib2 = 0.5.5
+coverage = 4.5.4
+docutils = 0.15.2
 filelock = 3.0.12
 idna = 2.8
 imagesize = 1.1.0
-importlib-metadata = 0.18
-lxml = 4.3.4
+importlib-metadata = 0.19
+lxml = 4.4.0
 manuel = 1.10.1
 mr.developer = 2.0.0
 nose = 1.3.7
-packaging = 19.0
-pip = 19.1.1
+packaging = 19.1
+pathlib2 = 2.3.4
+pip = 19.2.1
 pkginfo = 1.5.0.1
 plone.recipe.command = 1.1
 pluggy = 0.12.0
 py = 1.8.0
 pycparser = 2.19
-pyparsing = 2.4.0
+pyparsing = 2.4.2
 python-gettext = 4.0
 readme-renderer = 24.0
 repoze.sphinx.autointerface = 0.8
 requests = 2.22.0
 requests-toolbelt = 0.9.1
-snowballstemmer = 1.2.1
+scandir = 1.10.0
+snowballstemmer = 1.9
 soupsieve = 1.9.2
 sphinx-rtd-theme = 0.4.3
 sphinxcontrib-websupport = 1.1.2
-tempstorage = 5.0
 toml = 0.10.0
 tox = 3.13.2
 tqdm = 4.32.2
 twine = 1.13.0
 typing = 3.7.4
 urllib3 = 1.25.3
-virtualenv = 16.6.1
+virtualenv = 16.7.2
 webencodings = 0.5.1
 wheel = 0.33.4
 z3c.checkversions = 1.1
 zc.recipe.egg = 2.0.7
 zc.recipe.testrunner = 2.1
 zest.releaser = 6.19.0
-zipp = 0.5.1
-zodbupdate = 1.2
+zipp = 0.5.2
+zodbupdate = 1.3