Skip to content

Commit

Permalink
Merge 2af8347 into dee43a9
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Nov 27, 2019
2 parents dee43a9 + 2af8347 commit 8650664
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Expand Up @@ -55,6 +55,11 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst

- Improve documentation for Zope's error logging services.

- Add ``Paste`` as ``extras_require`` dependency to pull in ``Paste`` when
installing with `pip` and `constraints.txt` to prevent startup errors.
(`#734 <https://github.com/zopefoundation/Zope/issues/734>`_)


Backwards incompatible changes
++++++++++++++++++++++++++++++

Expand Down
3 changes: 1 addition & 2 deletions buildout.cfg
Expand Up @@ -45,8 +45,7 @@ eggs =
recipe = zc.recipe.egg
interpreter = zopepy
eggs =
Paste
Zope
Zope[wsgi]
zodbupdate


Expand Down
6 changes: 3 additions & 3 deletions docs/INSTALL.rst
Expand Up @@ -166,8 +166,8 @@ version you find on https://zopefoundation.github.io/Zope/:
$ python3.7 -m venv zope
$ cd zope
$ bin/pip install -U pip
$ bin/pip install Zope==4.1 \
-c https://zopefoundation.github.io/Zope/releases/4.1/constraints.txt
$ bin/pip install Zope[wsgi]==4.1.2 \
-c https://zopefoundation.github.io/Zope/releases/4.1.2/constraints.txt
You can also install Zope using a single requirements file. Note that this
installation method might install packages that are not actually needed (i. e.
Expand All @@ -176,7 +176,7 @@ more than are listed in the ``install_requires`` section of ``setup.py``):
.. code-block:: console
$ bin/pip install \
-r https://zopefoundation.github.io/Zope/releases/4.1/requirements-full.txt
-r https://zopefoundation.github.io/Zope/releases/4.1.2/requirements-full.txt
Building the documentation with ``Sphinx``
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Expand Up @@ -130,6 +130,9 @@ def _read_file(filename):
'sphinx_rtd_theme',
'repoze.sphinx.autointerface',
],
'wsgi': [
'Paste',
],
},
entry_points={
'paste.app_factory': [
Expand Down

0 comments on commit 8650664

Please sign in to comment.