New installation instructions & credits (backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4053176

1 files changed, 21 insertions, 21 deletions

diff --git a/setup.py b/setup.py
index c7168682..68203829 100755
--- a/setup.py
+++ b/setup.py
@@ -1,25 +1,14 @@
 #!/usr/bin/env python
 """Distutils setup file, used to install or test 'setuptools'"""
 
-def get_description():
-    # Get our long description from the documentation
-    f = file('setuptools.txt')
-    lines = []
-    for line in f:
-        if not line.strip():
-            break     # skip to first blank line
-    for line in f:
-        if line.startswith('.. contents::'):
-            break     # read to table of contents
-        lines.append(line)
-    f.close()
-    return ''.join(lines)
-
 from distutils.util import convert_path
-d = {}; execfile(convert_path('setuptools/command/__init__.py'), d)
-SETUP_COMMANDS = d['__all__']
 
+d = {}
+execfile(convert_path('setuptools/command/__init__.py'), d)
+
+SETUP_COMMANDS = d['__all__']
 VERSION = "0.6c4"
+
 from setuptools import setup, find_packages
 import sys
 scripts = []
@@ -30,9 +19,9 @@ setup(
     description="Download, build, install, upgrade, and uninstall Python "
         "packages -- easily!",
     author="Phillip J. Eby",
-    author_email="peak@eby-sarna.com",
+    author_email="distutils-sig@python.org",
     license="PSF or ZPL",
-    long_description = get_description(),
+    long_description = open('README.txt').read(),
     keywords = "CPAN PyPI distutils eggs package management",
     url = "http://peak.telecommunity.com/DevCenter/setuptools",
     test_suite = 'setuptools.tests',
@@ -77,9 +66,6 @@ setup(
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
 
-
-
-
         "console_scripts": [
              "easy_install = setuptools.command.easy_install:main",
              "easy_install-%s = setuptools.command.easy_install:main"
@@ -93,6 +79,7 @@ setup(
             ['eggsecutable = setuptools.command.easy_install:bootstrap'],
         },
 
+
     classifiers = [f.strip() for f in """
     Development Status :: 3 - Alpha
     Intended Audience :: Developers
@@ -121,3 +108,16 @@ setup(
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+