Merge branch 'master' into fix-287

.editorconfig

@@ -0,0 +1,36 @@
+# EditorConfig Configurtaion file, for more details see:
+# http://EditorConfig.org
+# EditorConfig is a convention description, that could be interpreted
+# by multiple editors to enforce common coding conventions for specific
+# file types
+
+# top-most EditorConfig file:
+# Will ignore other EditorConfig files in Home directory or upper tree level.
+root = true
+
+
+[*]  # For All Files
+# Unix-style newlines with a newline ending every file
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+# Set default charset
+charset = utf-8
+# Indent style default
+indent_style = space
+# Max Line Length - a hard line wrap, should be disabled
+max_line_length = off
+
+[*.{py,cfg,ini}]
+# 4 space indentation
+indent_size = 4
+
+[*.{yml,zpt,pt,dtml}]
+# 2 space indentation
+indent_size = 2
+
+[{Makefile,.gitmodules}]
+# Tab indentation (no size specified, but view as 4 spaces)
+indent_style = tab
+indent_size = unset
+tab_width = unset

.gitignore

@@ -10,6 +10,7 @@
 .tox
 /bin/
 /build/
+/_build/
 /develop-eggs/
 /develop/
 /dist/
@@ -26,4 +27,4 @@
 coverage.xml
 pip-selfcheck.json
 Pipfile
-Pipfile.lock
+Pipfile.lock

.travis.yml

@@ -30,10 +30,6 @@ matrix:
           env: TOXENV=lint-py27
         - python: "3.6"
           env: TOXENV=lint-py36
-        - python: "3.7"
-          env: TOXENV=py37
-        - python: "3.7-dev"
-          env: TOXENV=py37
         - python: "3.8-dev"
           env: TOXENV=py38
 

CHANGES.rst

@@ -16,10 +16,14 @@ Breaking changes
 
 - Remove the ``OFS.History`` module which contained only BBB code since 4.0a2.
 
+- Remove `bootstrap.py`. To install Zope via `zc.buildout` install the
+  `zc.buildout` package in a virtual environment at first.
+
 New features
 ++++++++++++
 
 - Add zconsole module for running scripts and interactive mode.
+  See `documentation <https://zope.readthedocs.io/en/latest/operation.html#debugging-zope>`_.
 
 - Restore support for XML-RPC when using the WSGI publisher - dropped in 4.0a2.
 
@@ -36,6 +40,8 @@ New features
 - Render an error message when trying to upload a file without choosing one
   in ZMI of a DTMLMethod or DTMLDocument.
 
+- Add support for Python 3.7.
+
 Bugfixes
 ++++++++
 
@@ -71,6 +77,13 @@ Bugfixes
   in `zope.conf` on Python 2.
   (`#308 <https://github.com/zopefoundation/Zope/issue/308>`_)
 
+- Fix `HTTPResponse.setBody` when the published object returns a tuple.
+  (`#340 <https://github.com/zopefoundation/Zope/pull/340>`_)
+
+- Fix ``Products.Five.browser.ObjectManagerSiteView.makeSite``
+  to interact well with plone.testing's patching of the global site manager.
+  (`#361 <https://github.com/zopefoundation/Zope/pull/361>`_)
+
 
 4.0b5 (2018-05-18)
 ------------------

buildout.cfg

@@ -63,6 +63,7 @@ eggs = ZServer
 recipe = zc.recipe.egg
 interpreter = zopepy
 eggs = Zope
+       zodbupdate
 
 
 [alltests]

docs/INSTALL-buildout.rst

@@ -26,6 +26,7 @@ available:
   * 2.7
   * 3.5
   * 3.6
+  * 3.7
 
 - Zope needs the Python ``zlib`` module to be importable.  If you are
   building your own Python from source, please be sure that you have the
@@ -55,37 +56,38 @@ steps:
 
 - Run the buildout
 
+You may need to replace the used Zope version used in the examples (4.0b6) with
+ he one you actually want to install.
+
 On Linux, this can be done as follows::
 
-  $ wget https://pypi.python.org/packages/source/Z/Zope/Zope-<Zope version>.tar.gz
+  $ wget https://pypi.python.org/packages/source/Z/Zope/Zope-4.0b6.tar.gz
   $ tar xfvz Zope-<Zope version>.tar.gz
   $ cd Zope-<Zope version>
-  $ /path/to/your/python bootstrap.py
-  $ bin/buildout -n
+  $ python3.7 -m venv .
+  $ bin/pip install -U pip zc.buildout
+  $ bin/buildout
 
 .. note::
-  Instead of using the buildout configuration shipping with Zope itself, you
-  can also start with a minimum configuration like this::
+
+  When using Python 2.7 instead of calling ``python3.7 -m venv .`` you have to
+  install `virtualenv` and then call ``virtualenv-2.7 .``.
+
+Instead of using the buildout configuration shipping with Zope itself, you
+can also start with a minimum configuration like this::
 
     [buildout]
     extends =
-        https://zopefoundation.github.io/Zope/releases/master/versions-prod.cfg
+        https://zopefoundation.github.io/Zope/releases/4.0b6/versions-prod.cfg
     parts =
         zopescripts
-        zopepy
     
     [zopescripts]
     recipe = zc.recipe.egg
-    eggs =
-        Zope
-    
-    [zopepy]
-    recipe = zc.recipe.egg
     interpreter = zopepy
     eggs =
         Zope
 
-
 Creating a Zope instance
 ::::::::::::::::::::::::