From d4f3c49d40e0f8c61faf92d399ce216f2dbd7a67 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Mon, 12 Jun 2017 11:34:46 -0400 Subject: [PATCH] remove references to distribute in the docs distribute is dead, long live setuptools Change-Id: Iedf1fafeb1178aa9e7b74d67f87c10166026820d Signed-off-by: Doug Hellmann --- doc/source/install/index.rst | 11 +---------- doc/source/user/demoapp.rst | 5 +---- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index ec55f65..1317b58 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -10,16 +10,7 @@ cliff is being developed under Python 2.7 and tested with Python 3.5. Dependencies ============ -cliff depends on distribute_, the updated replacement for -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 +cliff depends on setuptools and its pkg_resources module. .. _install-basic: diff --git a/doc/source/user/demoapp.rst b/doc/source/user/demoapp.rst index 328b732..26dc7aa 100644 --- a/doc/source/user/demoapp.rst +++ b/doc/source/user/demoapp.rst @@ -246,8 +246,7 @@ output formatter and printing the data to the console. setup.py -------- -The demo application is packaged using distribute_, the modern -implementation of setuptools. +The demo application is packaged using setuptools. .. literalinclude:: ../../../demoapp/setup.py :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 should be managing. -.. _distribute: http://packages.python.org/distribute/ - Command Extension Hooks =======================