Merge pull request #1609 from qwcode/readme

have setup.py long_description just be README.rst

MANIFEST.in

@@ -1,7 +1,7 @@
 include AUTHORS.txt
 include LICENSE.txt
 include CHANGES.txt
-include PROJECT.txt
+include README.rst
 include pip/cacert.pem
 recursive-include docs *.rst
 recursive-include docs *.html

PROJECT.txt

@@ -1,11 +0,0 @@
-Project Info
-============
-
-* Project Page: https://github.com/pypa/pip
-* Install howto: http://www.pip-installer.org/en/latest/installing.html
-* Changelog: http://www.pip-installer.org/en/latest/news.html
-* Bug Tracking: https://github.com/pypa/pip/issues
-* Mailing list: http://groups.google.com/group/python-virtualenv
-* Docs: http://www.pip-installer.org/
-* User IRC: #pip on Freenode.
-* Dev IRC: #pypa on Freenode.

README.rst

@@ -1,10 +1,24 @@
 pip
 ===
 
+The `PyPA recommended
+<https://python-packaging-user-guide.readthedocs.org/en/latest/current.html>`_
+tool for installing and managing Python packages.
+
+* `Installation <http://www.pip-installer.org/en/latest/installing.html>`_
+* `Documentation <http://www.pip-installer.org>`_
+* `Changelog <http://www.pip-installer.org/en/latest/news.html>`_
+* `Github Page <https://github.com/pypa/pip>`_
+* `Issue Tracking <https://github.com/pypa/pip/issues>`_
+* `Mailing list <http://groups.google.com/group/python-virtualenv>`_
+* User IRC: #pip on Freenode.
+* Dev IRC: #pypa on Freenode.
+
+
 .. image:: https://pypip.in/v/pip/badge.png
         :target: https://pypi.python.org/pypi/pip
 
 .. image:: https://secure.travis-ci.org/pypa/pip.png?branch=develop
    :target: http://travis-ci.org/pypa/pip
 
-For documentation, see http://www.pip-installer.org
+

setup.py

@@ -38,8 +38,7 @@ def find_version(*file_paths):
         return version_match.group(1)
     raise RuntimeError("Unable to find version string.")
 
-long_description = "\n" + "\n".join([read('PROJECT.txt'),
-                                     read('docs', 'quickstart.rst')])
+long_description = read('README.rst')
 
 tests_require = ['pytest', 'virtualenv>=1.10', 'scripttest>=1.3', 'mock']
 
@@ -57,9 +56,10 @@ setup(
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.1",
         "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: Implementation :: PyPy"
     ],
     keywords='easy_install distutils setuptools egg virtualenv',
     author='The pip developers',

tox.ini

@@ -17,7 +17,6 @@ basepython = python2.7
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
 
-
 [testenv:pep8]
 basepython = python2.7
 deps = flake8