Merge branch 'master' into PermissionsDocument

.gitignore

@@ -25,3 +25,5 @@
 /var/
 coverage.xml
 pip-selfcheck.json
+Pipfile
+Pipfile.lock

.travis.yml

@@ -1,24 +1,58 @@
 language: python
 sudo: false
-python:
-    - 2.7
-    - 3.5
-    - 3.6
+
+matrix:
+    include:
+        - python: "2.7"
+          env: TOXENV=lint-py27
+        - python: "3.6"
+          env: TOXENV=lint-py36
+        - python: "2.7"
+          env: TOXENV=py27
+        - python: "3.5"
+          env: TOXENV=py35
+        - python: "3.6"
+          env: TOXENV=py36
+        - python: "3.7"
+          env: TOXENV=py37
+          dist: xenial
+          sudo: true
+        - python: "3.7-dev"
+          env: TOXENV=py37
+          dist: xenial
+          sudo: true
+        - python: "3.8-dev"
+          env: TOXENV=py38
+          dist: xenial
+          sudo: true
+    allow_failures:
+        - python: "2.7"
+          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
+
 install:
-    - pip install -U setuptools==`grep setuptools versions.cfg | awk '{print $3}'`
-    - pip install six==`grep '^six' versions-prod.cfg | awk '{print $3}'`
-    - pip install zc.buildout==`grep '^zc.buildout' versions.cfg | awk '{print $3}'`
-    - pip install coveralls coverage
-    - buildout bootstrap
-    - buildout install test alltests
+    - travis_retry pip install -U pip setuptools
+    - travis_retry pip install -U tox coveralls coverage
+
 script:
-    - coverage run bin/alltests -v
+    - travis_retry tox
+
 after_success:
+    - coverage combine
     - coveralls
     # Bails out for non-tags
     - ./update_index.sh
+
 notifications:
     email: false
+
 cache:
   pip: true
   directories:

CHANGES.rst

@@ -11,9 +11,16 @@ https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
 4.0b6 (unreleased)
 ------------------
 
+Breaking changes
+++++++++++++++++
+
+- Remove the ``OFS.History`` module which contained only BBB code since 4.0a2.
+
 New features
 ++++++++++++
 
+- Add zconsole module for running scripts and interactive mode.
+
 - Restore support for XML-RPC when using the WSGI publisher - dropped in 4.0a2.
 
 - Add a minimum ``buildout.cfg`` suggestion in the docs for creating ``wsgi``
@@ -26,6 +33,10 @@ New features
 Bugfixes
 ++++++++
 
+- Restore controls for reordering items in an Ordered Folder and list them
+  according to the internal order by default in ZMI.
+  (`#344 <https://github.com/zopefoundation/Zope/pull/344>`_)
+
 - Call exception view before triggering _unauthorized.
   (`#304 <https://github.com/zopefoundation/Zope/pull/304>`_)
 
@@ -47,6 +58,13 @@ Bugfixes
   when reading request bodies not encoded as application/x-www-form-urlencoded
   or multipart/form-data.
 
+- Show navigation in ``manage_menu`` in case the databases cannot be retrieved.
+  (`#309 <https://github.com/zopefoundation/Zope/issues/309>`_)
+
+- Prevent breaking page rendering when setting `default-zpublisher-encoding`
+  in `zope.conf` on Python 2.
+  (`#308 <https://github.com/zopefoundation/Zope/issue/308>`_)
+
 
 4.0b5 (2018-05-18)
 ------------------
@@ -234,14 +252,14 @@ Breaking changes
 - Stop setting ``CLIENT_HOME`` as a builtin, get it via
   ``App.config.getConfiguration().clienthome`` instead.
 
-- Drop `OFS.History` functionality.
+- Drop ``OFS.History`` functionality.
 
-- Removed `OFS.DefaultObservable` - an early predecessor of `zope.event`.
+- Removed ``OFS.DefaultObservable`` - an early predecessor of `zope.event`.
 
-- Removed `OFS.ZDOM`. `OFS.SimpleItem.Item` now implements `getParentNode()`.
+- Removed ``OFS.ZDOM``. `OFS.SimpleItem.Item` now implements `getParentNode()`.
 
 - Removed special code to create user folders and page templates while creating
-  new `OFS.Folder` instances.
+  new ``OFS.Folder` instances.
 
 - Removed the `App.version_txt.getZopeVersion` API, you can use
   ``pkg_resources.get_distribution('Zope').version`` instead.

README.rst

@@ -40,6 +40,7 @@ Zope can either be installed using:
 
 * `zc.buildout`, see https://zope.readthedocs.io/en/latest/INSTALL-buildout.html
 * `virtualenv` and `pip`, see https://zope.readthedocs.io/en/latest/INSTALL-virtualenv.html
+* `pipenv`, see https://zope.readthedocs.io/en/latest/INSTALL-pipenv.html
 
 License
 =======

appveyor.yml

@@ -0,0 +1,58 @@
+# AppVeyor CI settings (Windows Machine CI Tests)
+
+matrix:
+  allow_failures:
+  - PROFILE: py27-conventions
+  - PROFILE: py35-conventions
+  - PROFILE: py36-conventions
+  - PROFILE: py237-conventions
+  - PROFILE: py37
+  - PROFILE: py38
+
+environment:
+  matrix:
+    - PROFILE: py27-conventions
+      PYTHON_VERSION: 2.7"
+      TOXENV: "lint"
+    - PROFILE: py35-conventions
+      PYTHON_VERSION: 3.6"
+      TOXENV: "lint"
+    - PROFILE: py36-conventions
+      PYTHON_VERSION: 3.6"
+      TOXENV: "lint"
+    - PROFILE: py37-conventions
+      PYTHON_VERSION: 3.7"
+      TOXENV: "lint"
+    - PROFILE: py27
+      PYTHON_VERSION: 2.7"
+      TOXENV: "py27"
+    - PROFILE: py35
+      PYTHON_VERSION: 3.5"
+      TOXENV: "py35"
+    - PROFILE: py36
+      PYTHON_VERSION: 3.6"
+      TOXENV: "py36"
+    - PROFILE: py37
+      PYTHON_VERSION: 3.7"
+      TOXENV: "py37"
+    - PROFILE: py38
+      PYTHON_VERSION: 3.8"
+      TOXENV: "py38"
+
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
+
+version: '{branch}.{build}'
+
+install:
+  - "python.exe -m pip install tox"
+
+build: off
+
+test_script:
+  - "tox.exe"
+
+after_test:
+  - coveralls
+  # Bails out for non-tags
+  - ./update_index.sh

buildout.cfg

@@ -30,6 +30,7 @@ auto-checkout =
     Products.TemporaryFolder
     Products.SiteErrorLog
     ExtensionClass
+    DocumentTemplate
 
 [testenv]
 PYTHONHASHSEED = random

constraints.txt

@@ -0,0 +1,89 @@
+AccessControl==4.0b4
+Acquisition==4.4.4
+AuthEncoding==4.0.0
+BTrees==4.5.0
+Chameleon==3.4
+DateTime==4.2
+DocumentTemplate==3.0b3
+ExtensionClass==4.3.0
+Missing==4.0.1
+MultiMapping==4.0
+PasteDeploy==1.5.2
+Persistence==3.0b3
+Products.BTreeFolder2==4.0.0
+Products.ZCTextIndex==4.0.2
+Products.ZCatalog==4.1
+Record==3.4
+RestrictedPython==4.0b5
+WSGIProxy2==0.4.4
+WebOb==1.8.1
+WebTest==2.0.29
+ZConfig==3.2.0
+ZEO==5.2.0
+ZODB==5.4.0
+ZServer==4.0b1 ; python_version < '3.0'
+Zope2==4.0b1
+five.globalrequest==99.1
+five.localsitemanager==3.1
+funcsigs==1.0.2
+future==0.16.0
+ipaddress==1.0.22
+mock==2.0.0
+pbr==4.0.3
+persistent==4.2.4.2
+pytz==2018.4
+shutilwhich==1.1.0
+six==1.11.0
+transaction==2.2.1
+waitress==1.1.0
+z3c.pt==3.1.0
+zExceptions==4.0
+zc.lockfile==1.3.0
+zdaemon==4.2.0
+zodbpickle==1.0.1
+zope.annotation==4.6.0
+zope.browser==2.2.0
+zope.browsermenu==4.3.0
+zope.browserpage==4.2.0
+zope.browserresource==4.2.1
+zope.cachedescriptors==4.3.1
+zope.component==4.4.1
+zope.componentvocabulary==2.1.0
+zope.configuration==4.1.0
+zope.container==4.2.1
+zope.contentprovider==4.1.0
+zope.contenttype==4.3.0
+zope.datetime==4.2.0
+zope.deferredimport==4.2.1
+zope.deprecation==4.3.0
+zope.dottedname==4.2.0
+zope.event==4.3.0
+zope.exceptions==4.2.0
+zope.filerepresentation==4.2.0
+zope.formlib==4.4
+zope.globalrequest==1.4
+zope.i18n==4.3.1
+zope.i18nmessageid==4.1.0
+zope.interface==4.5.0
+zope.lifecycleevent==4.2.0
+zope.location==4.1.0
+zope.pagetemplate==4.3.0
+zope.processlifetime==2.2.0
+zope.proxy==4.3.0
+zope.ptresource==4.1.0
+zope.publisher==4.3.2
+zope.ramcache==2.2.0
+zope.schema==4.5.0
+zope.security==4.2.2
+zope.sendmail==4.1.0
+zope.sequencesort==4.0.1
+zope.site==4.1.0
+zope.size==4.2.0
+zope.structuredtext==4.2.0
+zope.tal==4.3.1
+zope.tales==4.2.0
+zope.testbrowser==5.2.4
+zope.testing==4.6.2
+zope.testrunner==4.8.1
+zope.traversing==4.2.0
+zope.viewlet==4.1.0

docs/INSTALL-pipenv.txt

@@ -0,0 +1,81 @@
+Installing Zope via ``pipenv``
+==============================
+
+.. highlight:: bash
+
+This document describes how to install Zope via ``pipenv``. Python 3 only.
+
+Please note, that the support for Pipenv is considered experimental.
+
+Also, currently there is no support to update the Zope installation via ``pipenv``.
+
+
+Create a Virtual Environment
+----------------------------
+
+.. code-block:: sh
+
+   $ python3.6 -m venv zope
+   $ cd zope
+
+
+Install pipenv
+--------------
+
+.. code-block:: sh
+
+    $ bin/pip install pipenv
+
+
+Install the Zope Software Packages
+----------------------------------
+
+Look for the release you want to install on
+https://zopefoundation.github.io/Zope/. Than use the specific
+version of ``requirements-full.txt`` in the URL, replacing 4.0b4 in the example below.
+(Remove the --pre option for final releases.)
+
+.. code-block:: sh
+
+   $ bin/pipenv install -r https://zopefoundation.github.io/Zope/releases/4.0b4/requirements-full.txt --pre
+   ...
+   Successfully installed ...
+
+
+Creating a Zope instance
+------------------------
+
+Once you've installed Zope, you will need to create an "instance
+home". This is a directory that contains configuration and data for a
+Zope server process.  The instance home is created using the
+``mkwsgiinstance`` script:
+
+.. code-block:: sh
+
+  $ bin/pipenv run mkwsgiinstance -d .
+
+You will be asked to provide a user name and password for an
+administrator's account during ``mkwsgiinstance``.  To see the available
+command-line options, run the script with the ``--help`` option:
+
+.. code-block:: sh
+
+   $ bin/pipenv run mkwsgiinstance --help
+
+The `-d .` specifies the directory to create the instance home in.
+If you follow the example and choose the current directory, you'll
+find the instances files in the subdirectories of the ``virtualenv``:
+
+- ``etc/`` will hold the configuration files.
+- ``var/`` will hold the database files.
+
+
+Starting your created instance
+------------------------------
+
+To start your newly created instance, run the provided runwsgi script 
+with the generated configuration:
+
+.. code-block:: sh
+
+    $ bin/pipenv run runwsgi etc/zope.ini