Skip to content

Commit

Permalink
Add missing Paste dependency. (#735)
Browse files Browse the repository at this point in the history
* Add missing Paste dependency.

Otherwise Zope won't start up when installed with `pip` and the
`constraints.txt` file.

* - move Paste into an extra

* Some more coherence

with the previous example

* - the extra doesn't exist yet on 4.1.2, but will on 4.1.3 [ci skip]

* - note about changed install [ci skip]
  • Loading branch information
dataflake committed Nov 27, 2019
1 parent a9d27af commit d7b987f
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 @@ -12,6 +12,11 @@ https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
4.1.3 (unreleased)
------------------

- Add ``Paste`` as ``extras_require`` dependency to pull in ``Paste`` when
installing with `pip` and `constraints.txt` to prevent startup errors.
This requires adding the ``[wsgi]`` extra in the egg specification.
(`#734 <https://github.com/zopefoundation/Zope/issues/734>`_)

- Fix broken deprecated import when ZServer is not installed
(`#714 <https://github.com/zopefoundation/Zope/issues/714>`_)

Expand Down
3 changes: 1 addition & 2 deletions buildout.cfg
Expand Up @@ -52,8 +52,7 @@ eggs = ZServer
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 @@ -188,8 +188,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.3 \
-c https://zopefoundation.github.io/Zope/releases/4.1.3/constraints.txt
.. note::

Expand All @@ -203,7 +203,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.3/requirements-full.txt
If you are on Python 2 and want to use ZServer instead of WSGI , you'll have to
install that package seperately using the version spec in constraints.txt
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Expand Up @@ -132,6 +132,9 @@ def _read_file(filename):
'sphinx_rtd_theme',
'repoze.sphinx.autointerface',
],
'wsgi': [
'Paste',
],
},
entry_points={
'paste.app_factory': [
Expand Down

0 comments on commit d7b987f

Please sign in to comment.