From 6c9685826c183f4740ad31832704398014fe357e Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Sun, 1 May 2011 12:51:33 -0500 Subject: [PATCH] Fixed setup.py long-description to account for sphinx index.html changes. --- docs/index.txt | 2 ++ setup.py | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/index.txt b/docs/index.txt index f68e2afa4..b7ce58e25 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -17,6 +17,8 @@ In order to use pip, you must first install `setuptools If you use virtualenv, a copy of pip will be automatically be installed in each virtual environment you create. +.. comment: split here + .. toctree:: :maxdepth: 1 diff --git a/setup.py b/setup.py index 3b072376b..6037fdb0b 100644 --- a/setup.py +++ b/setup.py @@ -8,14 +8,18 @@ version = "1.0.1" doc_dir = os.path.join(os.path.dirname(__file__), "docs") index_filename = os.path.join(doc_dir, "index.txt") news_filename = os.path.join(doc_dir, "news.txt") -long_description = """\ +long_description = """ + The main website for pip is `www.pip-installer.org `_. You can also install the `in-development version `_ of pip with ``easy_install pip==dev``. + """ f = open(index_filename) -long_description += f.read().split("split here", 1)[1] +# remove the toctree from sphinx index, as it breaks long_description +parts = f.read().split("split here", 2) +long_description = parts[0] + long_description + parts[2] f.close() f = open(news_filename) long_description += "\n\n" + f.read()