openstack
/
deb-python-cliff
Code Issues Proposed changes

Merge "remove references to distribute in the docs"

This commit is contained in:
Jenkins 2017-06-30 18:18:07 +00:00 committed by Gerrit Code Review
parent 7279f4b096 d4f3c49d40
commit 93bc45bfeb
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/source/install/index.rst
View File

@ -10,16 +10,7 @@ cliff is being developed under Python 2.7 and tested with Python 3.5.
Dependencies Dependencies
============ ============
cliff depends on distribute_, the updated replacement for cliff depends on setuptools and its pkg_resources module.
setuptools. If you have an older version of setuptools installed, `you
may have trouble installing cliff`_ until you upgrade or set up a
virtualenv_ using distribute instead (by using ``--use-distribute``).
.. _distribute: http://pypi.python.org/pypi/distribute
.. _you may have trouble installing cliff: https://bitbucket.org/tarek/distribute/issue/91/install-glitch-when-using-pip-virtualenv
.. _virtualenv: http://pypi.python.org/pypi/virtualenv
.. _install-basic: .. _install-basic:

5
doc/source/user/demoapp.rst
View File

@ -246,8 +246,7 @@ output formatter and printing the data to the console.
setup.py setup.py
-------- --------
The demo application is packaged using distribute_, the modern The demo application is packaged using setuptools.
implementation of setuptools.
.. literalinclude:: ../../../demoapp/setup.py .. literalinclude:: ../../../demoapp/setup.py
:linenos: :linenos:
@ -258,8 +257,6 @@ The important parts of the packaging instructions are the
command namespace so that it only loads the command plugins that it command namespace so that it only loads the command plugins that it
should be managing. should be managing.
.. _distribute: http://packages.python.org/distribute/
Command Extension Hooks Command Extension Hooks
======================= =======================