Merge branch 'master' into deprecated_splitport_splittype

CHANGES.rst

@@ -8,60 +8,74 @@ https://zope.readthedocs.io/en/2.13/CHANGES.html
 For the change log of the alpha versions see
 https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
 
-4.0b10 (unreleased)
+4.0b11 (unreleased)
+-------------------
+
+- Nothing changed yet.
+
+
+4.0b10 (2019-03-08)
 -------------------
 
 Fixes
 +++++
 
-- Resurrected copyright and license page
+- Fix import file drop down on import export page.
+  (`#524 <https://github.com/zopefoundation/Zope/issues/524>`_)
+
+- Resurrect copyright and license page.
   (`#482 <https://github.com/zopefoundation/Zope/issues/482>`_)
 
-- Fix FindSupport binary value handling
+- Fix FindSupport binary value handling.
   (`#406 <https://github.com/zopefoundation/Zope/issues/406>`_)
 
 - Fix remove double quoting in ``ZPublisher.HTTPRequest.search_type``
   (`#511 <https://github.com/zopefoundation/Zope/issues/511>`_)
 
-- Fix subscript access on Page Template ``macros`` attribute
+- Fix subscript access on Page Template ``macros`` attribute.
   (`#210 <https://github.com/zopefoundation/Zope/issues/210>`_)
 
-- Fix ``OFS.interfaces`` attribute declarations to match reality
+- Fix ``OFS.interfaces`` attribute declarations to match reality.
   (`#498 <https://github.com/zopefoundation/Zope/issues/498>`_)
 
-- Fix handling of DTML in Ace editor
+- Fix handling of DTML in Ace editor.
   (`#489 <https://github.com/zopefoundation/Zope/issues/489>`_)
 
-- Fix error when not selecting a file for upload in Files and Images
+- Fix error when not selecting a file for upload in Files and Images.
   (`#492 <https://github.com/zopefoundation/Zope/issues/492>`_)
 
-- Fix ZMI add handling of ``len(filtered_meta_types()) == 1``
+- Fix ZMI add handling of ``len(filtered_meta_types()) == 1``.
   (`#505 <https://github.com/zopefoundation/Zope/issues/505>`_)
 
-- Fix ZMI add handling of ``addItemSelect`` form
+- Fix ZMI add handling of ``addItemSelect`` form.
   (`#506 <https://github.com/zopefoundation/Zope/issues/506>`_)
 
-- Don't always flag PubBeforeAbort and PubBeforeAbort as retry
+- Don't always flag ``PubBeforeAbort`` and ``PubBeforeAbort`` as retry.
   (`#502 <https://github.com/zopefoundation/Zope/pull/502>`_)
 
-Other changes
-+++++++++++++
-
-- Make sure the WSGI Response object respects lock semantics
-  (`#216 <https://github.com/zopefoundation/Zope/issues/216>`_)
+Features
+++++++++
 
-- Specify supported Python versions using ``python_requires`` in setup.py
+- Specify supported Python versions using ``python_requires`` in `setup.py`.
   (`#481 <https://github.com/zopefoundation/Zope/issues/481>`_)
 
-- Removed references to separate ``Products.ZCTextIndex``
-  (`516 <https://github.com/zopefoundation/Zope/issues/516>`_)
-
 - Provide additional links on PyPI with ``project_urls`` in ``setup.py``
   (`#434 <https://github.com/zopefoundation/Zope/issues/434>`_)
 
-- Resurrect automatic support for ``standard_error_message`` DTML Method
+- Resurrect automatic support for ``standard_error_message`` DTML Method.
   (`#238 <https://github.com/zopefoundation/Zope/issues/238>`_)
 
+Other changes
++++++++++++++
+
+- Make sure the WSGI Response object respects lock semantics.
+  (`#216 <https://github.com/zopefoundation/Zope/issues/216>`_)
+
+- Remove references to separate ``Products.ZCTextIndex``.
+  (`516 <https://github.com/zopefoundation/Zope/issues/516>`_)
+
+- Update dependencies to newest versions.
+
 
 4.0b9 (2019-02-09)
 ------------------

buildout.cfg

@@ -19,11 +19,6 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
-    Products.BTreeFolder2
-    Products.MailHost
-    Products.PythonScripts
-    Products.SiteErrorLog
-    Products.ZCatalog
 
 [testenv]
 PYTHONHASHSEED = random

constraints.txt

@@ -4,21 +4,21 @@ AuthEncoding==4.1
 BTrees==4.5.1
 Chameleon==3.6
 DateTime==4.3
-DocumentTemplate==3.0b5
+DocumentTemplate==3.0b6
 ExtensionClass==4.4
 Missing==4.1
 MultiMapping==4.1
 PasteDeploy==2.0.1
 Persistence==3.0b4
-Products.BTreeFolder2==4.1
-Products.ZCatalog==4.3
+Products.BTreeFolder2==4.2
+Products.ZCatalog==4.4
 Record==3.5
 RestrictedPython==4.0b8
-WSGIProxy2==0.4.5
+WSGIProxy2==0.4.6
 WebOb==1.8.5
-WebTest==2.0.32
+WebTest==2.0.33
 ZConfig==3.4.0
-ZEO==5.2.0
+ZEO==5.2.1
 ZODB==5.5.1
 ZServer==4.0b3 ; python_version < '3.0'
 Zope2==4.0b1
@@ -28,7 +28,7 @@ funcsigs==1.0.2
 future==0.17.1
 ipaddress==1.0.22
 mock==2.0.0
-pbr==5.1.2
+pbr==5.1.3
 persistent==4.4.3
 pytz==2018.9
 shutilwhich==1.1.0
@@ -48,7 +48,7 @@ zope.browserresource==4.3
 zope.cachedescriptors==4.3.1
 zope.component==4.5
 zope.componentvocabulary==2.2.0
-zope.configuration==4.3.0
+zope.configuration==4.3.1
 zope.container==4.2.2
 zope.contentprovider==4.2.1
 zope.contenttype==4.4
@@ -59,10 +59,10 @@ zope.dottedname==4.3
 zope.event==4.4
 zope.exceptions==4.3
 zope.filerepresentation==4.2.0
-zope.formlib==4.5.0
+zope.formlib==4.6.0
 zope.globalrequest==1.5
 zope.hookable==4.2.0
-zope.i18n==4.6.1
+zope.i18n==4.6.2
 zope.i18nmessageid==4.3.1
 zope.interface==4.6.0
 zope.lifecycleevent==4.3.0

docs/maintenance.rst

@@ -29,14 +29,22 @@ Steps for creating a new Zope release
 - Check the versions.cfg file for outdated or updated
   packages and update version information where necessary::
 
-  $ bin/checkversions buildout.cfg
+  $ bin/checkversions versions-prod.cfg
+  $ bin/checkversions versions.cfg
 
 .. note::
 
     There is no version pin for `zc.buildout` as it has to be installed
     in the virtual environment but `checkversions` also prints its
     version number.
 
+    There is no version pin for `zc.recipe.egg` in `versions-prod.cfg` as it is
+    only needed for buildout install and not for pip, so we do not want to
+    have it in `requirements.txt`.
+
+    The script is called two times so the rendered version updates can be
+    easily assigned to the correct file.
+
 - Garden the change log.
 
 - Run the tests::

requirements-full.txt

@@ -5,21 +5,21 @@ AuthEncoding==4.1
 BTrees==4.5.1
 Chameleon==3.6
 DateTime==4.3
-DocumentTemplate==3.0b5
+DocumentTemplate==3.0b6
 ExtensionClass==4.4
 Missing==4.1
 MultiMapping==4.1
 PasteDeploy==2.0.1
 Persistence==3.0b4
-Products.BTreeFolder2==4.1
-Products.ZCatalog==4.3
+Products.BTreeFolder2==4.2
+Products.ZCatalog==4.4
 Record==3.5
 RestrictedPython==4.0b8
-WSGIProxy2==0.4.5
+WSGIProxy2==0.4.6
 WebOb==1.8.5
-WebTest==2.0.32
+WebTest==2.0.33
 ZConfig==3.4.0
-ZEO==5.2.0
+ZEO==5.2.1
 ZODB==5.5.1
 Zope2==4.0b1
 five.globalrequest==99.1
@@ -28,7 +28,7 @@ funcsigs==1.0.2
 future==0.17.1
 ipaddress==1.0.22
 mock==2.0.0
-pbr==5.1.2
+pbr==5.1.3
 persistent==4.4.3
 pytz==2018.9
 shutilwhich==1.1.0
@@ -48,7 +48,7 @@ zope.browserresource==4.3
 zope.cachedescriptors==4.3.1
 zope.component==4.5
 zope.componentvocabulary==2.2.0
-zope.configuration==4.3.0
+zope.configuration==4.3.1
 zope.container==4.2.2
 zope.contentprovider==4.2.1
 zope.contenttype==4.4
@@ -59,10 +59,10 @@ zope.dottedname==4.3
 zope.event==4.4
 zope.exceptions==4.3
 zope.filerepresentation==4.2.0
-zope.formlib==4.5.0
+zope.formlib==4.6.0
 zope.globalrequest==1.5
 zope.hookable==4.2.0
-zope.i18n==4.6.1
+zope.i18n==4.6.2
 zope.i18nmessageid==4.3.1
 zope.interface==4.6.0
 zope.lifecycleevent==4.3.0

setup.py

@@ -29,7 +29,7 @@ def _read_file(filename):
 README = _read_file('README.rst')
 CHANGES = _read_file('CHANGES.rst')
 
-version = '4.0b10.dev0'
+version = '4.0b11.dev0'
 
 
 setup(

src/OFS/dtml/importExport.dtml

@@ -9,7 +9,7 @@
 		them to a different Zope installation. You can either choose
 		to download the export file to your local machine, or save it
 		in the <code>var</code> directory of your Zope installation
-		on the server. 
+		on the server.
 		<strong>Note:</strong>
 		Zope can export/import objects in a binary format (called
 		ZEXP). The ZEXP format is the officially supported export/import
@@ -69,7 +69,7 @@
 			<div class="col-sm-9 col-md-10">
 				<select class="form-control" id="file" name="file">
 					<dtml-in "list_imports()"
-						>option value="<dtml-var sequence-item>"><dtml-var sequence-item></option>
+						><option value="<dtml-var sequence-item>"><dtml-var sequence-item></option>
 					</dtml-in>
 				</select>
 			</div>
@@ -90,7 +90,7 @@
 		</div>
 
 		<div class="zmi-controls">
-			<input class="btn btn-primary" type="submit" name="submit" value="Export" />
+			<input class="btn btn-primary" type="submit" name="submit" value="Import" />
 		</div>
 
 	</form>

tox.ini

@@ -35,7 +35,7 @@ commands =
     coverage combine
     coverage html -i
     coverage xml -i
-    coverage report -i --fail-under=80
+    coverage report -i --fail-under=80.5
 
 [testenv:isort-apply]
 basepython = python3.6

versions-prod.cfg

@@ -5,44 +5,45 @@
 Zope =
 Zope2 = 4.0b1
 AccessControl = 4.0b6
-AuthEncoding = 4.1
 Acquisition = 4.5
+AuthEncoding = 4.1
 BTrees = 4.5.1
 Chameleon = 3.6
 DateTime = 4.3
-DocumentTemplate = 3.0b5
+DocumentTemplate = 3.0b6
 ExtensionClass = 4.4
+Missing = 4.1
+MultiMapping = 4.1
+PasteDeploy = 2.0.1
+Persistence = 3.0b4
+Products.BTreeFolder2 = 4.2
+Products.ZCatalog = 4.4
+Record = 3.5
+RestrictedPython = 4.0b8
+WSGIProxy2 = 0.4.6
+WebOb = 1.8.5
+WebTest = 2.0.33
+ZConfig = 3.4.0
+ZEO = 5.2.1
+ZODB = 5.5.1
+ZServer = 4.0b3
 five.globalrequest = 99.1
 five.localsitemanager = 3.2.2
 funcsigs = 1.0.2
 future = 0.17.1
 ipaddress = 1.0.22
-Missing = 4.1
 mock = 2.0.0
-MultiMapping = 4.1
-PasteDeploy = 2.0.1
-pbr = 5.1.2
-Persistence = 3.0b4
+pbr = 5.1.3
 persistent = 4.4.3
-Products.BTreeFolder2 = 4.1
-Products.ZCatalog = 4.3
 pytz = 2018.9
-Record = 3.5
-RestrictedPython = 4.0b8
 shutilwhich = 1.1.0
 six = 1.12.0
 transaction = 2.4.0
 waitress = 1.2.1
-WebOb = 1.8.5
-WebTest = 2.0.32
-WSGIProxy2 = 0.4.5
 z3c.pt = 3.2.0
+zExceptions = 4.1
 zc.lockfile = 1.4
-ZConfig = 3.4.0
 zdaemon = 4.3
-ZEO = 5.2.0
-zExceptions = 4.1
-ZODB = 5.5.1
 zodbpickle = 1.0.3
 zope.annotation = 4.7.0
 zope.browser = 2.3
@@ -52,7 +53,7 @@ zope.browserresource = 4.3
 zope.cachedescriptors = 4.3.1
 zope.component = 4.5
 zope.componentvocabulary = 2.2.0
-zope.configuration = 4.3.0
+zope.configuration = 4.3.1
 zope.container = 4.2.2
 zope.contentprovider = 4.2.1
 zope.contenttype = 4.4
@@ -63,10 +64,10 @@ zope.dottedname = 4.3
 zope.event = 4.4
 zope.exceptions = 4.3
 zope.filerepresentation = 4.2.0
-zope.formlib = 4.5.0
+zope.formlib = 4.6.0
 zope.globalrequest = 1.5
 zope.hookable = 4.2.0
-zope.i18n = 4.6.1
+zope.i18n = 4.6.2
 zope.i18nmessageid = 4.3.1
 zope.interface = 4.6.0
 zope.lifecycleevent = 4.3.0
@@ -91,4 +92,3 @@ zope.testing = 4.7
 zope.testrunner = 4.9.2
 zope.traversing = 4.3.1
 zope.viewlet = 4.2.1
-ZServer = 4.0b3